Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 30 Apr 2012 00:38:04 +0000 (02:38 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 30 Apr 2012 00:38:04 +0000 (02:38 +0200)
Conflicts:
locale/escape_special_chars.php


Trivial merge