From: root <root@ns224730.ovh.net>
Date: Thu, 14 Nov 2013 17:26:02 +0000 (+0100)
Subject: Merge branch 'django' of /var/git/telecasting-www into django
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6da0f66f2beadfcf9750b014fca4f7d6b2aa001f;p=telecasting-www.git

Merge branch 'django' of /var/git/telecasting-www into django
---

6da0f66f2beadfcf9750b014fca4f7d6b2aa001f