From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Apr 2012 14:31:12 +0000 (+0200)
Subject: Merge branch 'master' of /var/git/telemeta
X-Git-Tag: 1.4.3-2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=768255ecd41dd008f436fd673fc2edde56e9baf2;p=telemeta.git

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

768255ecd41dd008f436fd673fc2edde56e9baf2