From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 1 Sep 2015 12:20:23 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6a~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=58e9a657e760e76c4dfe836927391ecee16acab8;p=telemeta.git

Merge branch 'dev'
---

58e9a657e760e76c4dfe836927391ecee16acab8