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