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)
commit3aacc6db438b98a515ce6f4ed42c68e4d06f63ea
treeec55a58524fb6c87dfa528bd8de2531b76ce2bef
parentaebe99dfea8799e73367d3339d9a30dd7f29fb55
parent5f13d8f7b344b1d806a423eb1daca56724e78ddd
Merge branch 'tarballs' into release

Conflicts:
locale/escape_special_chars.php