From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 29 Jan 2015 22:57:13 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.5.1~1^2~21
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bc29bb3294979665729b73796df4cb1b89f04703;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev

Conflicts:
	telemeta/locale
---

bc29bb3294979665729b73796df4cb1b89f04703