Michael Boke ba1270df2d Merge remote-tracking branch 'upstream/master' ... Conflicts: conf/app.ini		2014-10-03 22:51:07 +02:00
..
locale_de-DE.ini
locale_en-US.ini
locale_fr-CA.ini
locale_nl-NL.ini
locale_zh-CN.ini