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