From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Dec 2013 16:49:43 +0000 (+0100)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~463
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6c3402b36814fbd14b93d82acc9eab5e1b41cf7;p=teleforma.git

Merge branch 'prodev' of /var/git/teleforma into prodev
---

e6c3402b36814fbd14b93d82acc9eab5e1b41cf7