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

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

5f3a84c27d40836bacb5b10e464554e61859f321