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