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

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

d7171da999a9eec941e5cba738a4f83597cbf2e1