From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 4 Jun 2014 20:10:24 +0000 (+0200)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~288
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fae561af136cd3e69d91120ae96ec140ae9217ed;p=teleforma.git

Merge branch 'prodev' into pro
---

fae561af136cd3e69d91120ae96ec140ae9217ed