From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 15 Jan 2013 09:39:43 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~49
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aef3687cf4c1c78e8ed850a26114fdc69c34927e;p=telemeta.git

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

aef3687cf4c1c78e8ed850a26114fdc69c34927e