From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 15 Jan 2013 12:03:24 +0000 (+0100)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~495
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c5b2c54f3199280ca1ff362ffc874e223f77152;p=teleforma.git

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

7c5b2c54f3199280ca1ff362ffc874e223f77152