From: Guillaume Pellerin Date: Thu, 14 Nov 2013 17:27:19 +0000 (+0100) Subject: Merge branch 'django' of git.parisson.com:git/telecasting-www into django X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=250b5a2e8bb9afb3a9b0be1b5cd364beebb129b4;p=telecasting-www.git Merge branch 'django' of git.parisson.com:git/telecasting-www into django --- 250b5a2e8bb9afb3a9b0be1b5cd364beebb129b4