From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 16 Jan 2013 16:46:32 +0000 (+0100)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~492
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d95a9f2c2991b63f56ff847f08dd7887126472e3;p=teleforma.git

Merge branch 'prodev' of /var/git/teleforma into prodev
---

d95a9f2c2991b63f56ff847f08dd7887126472e3