Merge branch 'locales'
authorFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:45:15 +0000 (16:45 +0200)
committerFelix Dörre <felix@dogcraft.de>
Sat, 21 Jun 2014 14:45:15 +0000 (16:45 +0200)
commitee35e5cb8bc089fe43517043f72d1d5f821970b7
treeaa1b2c43a0b9e455354ab8ab90457794a7a3c529
parentaf18ad9f20634ee4479954788acd8c054db808dc
parentdd1ac40aa3d48cd24b9f0f0ec23a41fb5ef7c449
Merge branch 'locales'