From: yomguy <yomguy@parisson.com>
Date: Mon, 7 Jan 2013 23:36:11 +0000 (+0100)
Subject: Merge branch 'pro' into proindex
X-Git-Tag: 0.9-probarreau~152^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ec47806cc6524087e2c0eacf9dda961a53dc0e80;p=teleforma.git

Merge branch 'pro' into proindex
---

ec47806cc6524087e2c0eacf9dda961a53dc0e80