]> git.parisson.com Git - telecasting-www.git/commitdiff
Merge branch 'django' of /var/git/telecasting-www into django
authorroot <root@ns224730.ovh.net>
Thu, 14 Nov 2013 17:26:02 +0000 (18:26 +0100)
committerroot <root@ns224730.ovh.net>
Thu, 14 Nov 2013 17:26:02 +0000 (18:26 +0100)

Trivial merge