From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 26 Jan 2015 01:45:31 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.1~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=302bb4ea1aed106f21341d72f6ef3168bd10b30a;p=telemeta.git

Merge branch 'dev'
---

302bb4ea1aed106f21341d72f6ef3168bd10b30a