From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 21 May 2015 15:58:54 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/telemeta into dev
X-Git-Tag: 1.6a~4^2~61
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e4f6d45b81a7924589b55d5893cb4351ae238a7;p=telemeta.git

Merge branch 'dev' of git.parisson.com:git/telemeta into dev
---

0e4f6d45b81a7924589b55d5893cb4351ae238a7