From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 24 Feb 2015 22:41:22 +0000 (+0100)
Subject: Merge branch 'dev' into feature/epub
X-Git-Tag: 1.6a^2~19^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b9f1e7702927eaf224697f1c61bc93eaa00ffc96;p=telemeta.git

Merge branch 'dev' into feature/epub
---

b9f1e7702927eaf224697f1c61bc93eaa00ffc96