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