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)
commit50868b23fa58529558fd1cf3030e586f988c27ac
treeab7bda6b14ce0062df957b70f4c2ac7d8021db89
parent6061749dc0ece2873ef61a0c14af1b8a9e46034a
parenta4e96abf581a1473991e1c13ff3fdc21e8cdb9b2
Merge branch 'master' into dev
scripts/locales.pl