From: Guillaume Pellerin Date: Fri, 6 Dec 2013 20:41:13 +0000 (+0100) Subject: Merge branch 'prodev' of /var/git/teleforma into prodev X-Git-Tag: 2.8.1-pro~482 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=de20619e8b51994aadfd34b2b5fb2d16538f1490;p=teleforma.git Merge branch 'prodev' of /var/git/teleforma into prodev --- de20619e8b51994aadfd34b2b5fb2d16538f1490