From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 7 Nov 2012 09:49:07 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/teleforma into ae
X-Git-Tag: 0.9-probarreau~320^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aec4cbe6e6a208ee830404bac90713833fa078fe;p=teleforma.git

Merge branch 'dev' of /var/git/teleforma into ae
---

aec4cbe6e6a208ee830404bac90713833fa078fe