From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 16:07:35 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~53
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3c9fceebbf76b606f4d1e20ff51f22f1dd488b37;p=telemeta.git

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

3c9fceebbf76b606f4d1e20ff51f22f1dd488b37