From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 12 Jun 2013 17:19:14 +0000 (+0200)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~486
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eb3891f656ae8f01b246d4121780b4eb999ac807;p=teleforma.git

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

eb3891f656ae8f01b246d4121780b4eb999ac807