From: yomguy <yomguy@parisson.com>
Date: Fri, 2 Nov 2012 14:09:53 +0000 (+0100)
Subject: Merge branch 'dev' into ae
X-Git-Tag: 0.9-probarreau~320^2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3506ea3ce7849990ce2871eb3379083c3cf38fd6;p=teleforma.git

Merge branch 'dev' into ae
---

3506ea3ce7849990ce2871eb3379083c3cf38fd6