From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 14 Feb 2013 16:23:12 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~44
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9f5407cd46e9267a33226c49289788399580269f;p=telemeta.git

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

9f5407cd46e9267a33226c49289788399580269f