From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 23 Apr 2013 13:56:17 +0000 (+0200)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~489
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c3f09ae7c86de7b69ebe35f77a6e080637a1e0b5;p=teleforma.git

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

c3f09ae7c86de7b69ebe35f77a6e080637a1e0b5