From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 10 Jan 2013 11:04:21 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.4.5~51^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fd7449c189127da61c2413b9e2ac7a77452eed91;p=telemeta.git

Merge branch 'master' into dev
---

fd7449c189127da61c2413b9e2ac7a77452eed91