From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 11:18:38 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b59a94a112b82568177b82966801d9da3cd4656a;p=telemeta.git

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

b59a94a112b82568177b82966801d9da3cd4656a