From: yomguy <yomguy@parisson.com>
Date: Wed, 31 Oct 2012 15:14:59 +0000 (+0100)
Subject: Merge branch 'pro' into dev
X-Git-Tag: 0.9-probarreau~346
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2630872f897866a1b49e6f6652cf5cd5ccdd6863;p=teleforma.git

Merge branch 'pro' into dev
---

2630872f897866a1b49e6f6652cf5cd5ccdd6863