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

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

89b6a620db32ae4cd50c91c79372ffc1bedd8b51