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

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

f79f732b73df7bd21953187830ee84ed2e43a8b4