From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 8 Feb 2013 13:27:07 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~45
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9148237e812f6ff7cda53c65772206ceb3f6a064;p=telemeta.git

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

9148237e812f6ff7cda53c65772206ceb3f6a064