From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 10 Jan 2013 11:05:10 +0000 (+0100)
Subject: Merge branch 'dev' of /var/git/telemeta into dev
X-Git-Tag: 1.4.5~51
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d8ae8aa2cdbd8bd0c21eba90b06807f058db618f;p=telemeta.git

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

d8ae8aa2cdbd8bd0c21eba90b06807f058db618f