From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 19 Dec 2012 18:36:09 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~52
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8eb77f2b25da1d07d206dad67e33fad1555ae96f;p=telemeta.git

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

8eb77f2b25da1d07d206dad67e33fad1555ae96f