From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 30 May 2013 14:14:05 +0000 (+0200)
Subject: Merge branch 'pro' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~488
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=39ae8d496993e26ed4c89897a15adbb255b21e6d;p=teleforma.git

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

39ae8d496993e26ed4c89897a15adbb255b21e6d