From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 11 Dec 2014 10:46:15 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bf4f8021d194daf722aae6fd502537aec0bfb5b3;p=telemeta-pages.git

Merge branch 'dev'
---

bf4f8021d194daf722aae6fd502537aec0bfb5b3