From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 29 Dec 2013 22:12:03 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=adbfc1343fc392c67bcca7c3595df6a700a1c9fb;p=telemeta.git

Merge branch 'dev'
---

adbfc1343fc392c67bcca7c3595df6a700a1c9fb