From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 30 May 2013 14:32:54 +0000 (+0200)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 2.8.1-pro~484^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5ec1cf225fc32a7999d8e5ee6debed146fbe13bb;p=teleforma.git

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

5ec1cf225fc32a7999d8e5ee6debed146fbe13bb