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

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

34c9b8a1bc580a9fac327abf399e87c61ae4a13e