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

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

b8124e7740d49095ac3c3d97f2ad1a31a7423c20