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

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

451a0fda0e6a6c2fe88ecd96eef1dea0775588f1