From: yomguy <yomguy@parisson.com>
Date: Sat, 3 Nov 2012 12:38:28 +0000 (+0100)
Subject: Merge branch 'dev' into ae
X-Git-Tag: 0.9-probarreau~320^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4ab91b60a1a75a07fc9a45ea26ce7c03c244d8f4;p=teleforma.git

Merge branch 'dev' into ae
---

4ab91b60a1a75a07fc9a45ea26ce7c03c244d8f4