From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 14:36:26 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~55
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=523efdaea7b894881160dc3c5b1350955c556578;p=telemeta.git

Merge branch 'dev' of /var/git/telemeta into dev
---

523efdaea7b894881160dc3c5b1350955c556578