Merge branch 'master' into dev
authorThomas Heck <theck@linet-services.de>
Thu, 28 Feb 2013 08:58:35 +0000 (09:58 +0100)
committerThomas Heck <theck@linet-services.de>
Thu, 28 Feb 2013 08:58:35 +0000 (09:58 +0100)
1  2 
scripts/locales.pl

Simple merge