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

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

244049874f02b9023d0274c7f16b3013973a30d6