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

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

49dcc4c93f1d05b1acb9a2d0fd2f7b81bdcd7993