From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 7 Feb 2014 08:26:45 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.6^2~40
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5556164e872cde24e2ea3291cabe1e0eb9f4a009;p=telemeta.git

Merge branch 'master' into dev
---

5556164e872cde24e2ea3291cabe1e0eb9f4a009