From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 8 Jun 2016 22:36:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin' into demo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=55cf8cf68ddf023610806d12ef48ceb01ef9ca1d;p=telemeta.git

Merge remote-tracking branch 'origin' into demo

Conflicts:
	telemeta/locale
---

55cf8cf68ddf023610806d12ef48ceb01ef9ca1d