From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 1 Mar 2013 10:49:17 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~42
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=42820b1e46aaa6fd5315cb3ac082fd5969bcfdb5;p=telemeta.git

Merge branch 'dev' of /var/git/telemeta into dev
---

42820b1e46aaa6fd5315cb3ac082fd5969bcfdb5