From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:17:00 +0000 (+0200)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~58
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e9eaa82cf365410a904fc993225ebec74bde6bf4;p=telemeta.git

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

e9eaa82cf365410a904fc993225ebec74bde6bf4