From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 20 Apr 2012 13:06:30 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/telemeta
X-Git-Tag: 1.4.3-2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=84d12a33616dfc8a91223772bd1a52a836942cda;p=telemeta.git

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

84d12a33616dfc8a91223772bd1a52a836942cda