From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 21 Jun 2014 14:45:15 +0000 (+0200)
Subject: Merge branch 'locales'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=ee35e5cb8bc089fe43517043f72d1d5f821970b7

Merge branch 'locales'
---

ee35e5cb8bc089fe43517043f72d1d5f821970b7