From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 17 Apr 2015 16:19:04 +0000 (+0200)
Subject: Merge branch 'feature/epub' into dev
X-Git-Tag: 1.6a^2~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=03651dbf39cb5d6649130377257ec2cb4800ec7c;p=telemeta.git

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

03651dbf39cb5d6649130377257ec2cb4800ec7c