From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 2 May 2012 14:07:35 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/telemeta
X-Git-Tag: 1.4.3-2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b3298042fa7fc2b2e97122755971e6935e4d2914;p=telemeta.git

Merge branch 'master' of /var/git/telemeta
---

b3298042fa7fc2b2e97122755971e6935e4d2914