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