From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 15 Dec 2014 16:21:15 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.0rc3~2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=90e57095618b359dce0f23d6238bb8824b122586;p=telemeta.git

Merge branch 'dev'
---

90e57095618b359dce0f23d6238bb8824b122586