Merge branch 'master' into dev
authorThomas Heck <theck@linet-services.de>
Mon, 4 Mar 2013 08:51:27 +0000 (09:51 +0100)
committerThomas Heck <theck@linet-services.de>
Mon, 4 Mar 2013 08:51:27 +0000 (09:51 +0100)
commit87e65e6c1cc64bfb2d73b6914ed2ef136861dd42
tree0af36987790022fca204e0bad44daca80552ad64
parenta8f5fe51824487af16bf580be9262b6fbe68a64a
parent620fd32307d00c5382b5943bbbb9ffe240a70292
Merge branch 'master' into dev
SL/Layout/None.pm
scripts/locales.pl