From: Guillaume Pellerin Date: Mon, 9 Dec 2013 16:45:00 +0000 (+0100) Subject: Merge branch 'prodev' of /var/git/teleforma into prodev X-Git-Tag: 2.8.1-pro~466 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=36573e02df9521720dae9c86549c3440a15bc75b;p=teleforma.git Merge branch 'prodev' of /var/git/teleforma into prodev --- 36573e02df9521720dae9c86549c3440a15bc75b