Merge tarballs into release
authorMichael Tänzer <neo@nhng.de>
Tue, 21 Aug 2012 21:50:01 +0000 (23:50 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 21 Aug 2012 21:50:01 +0000 (23:50 +0200)
File permission conflict in scripts/resetpermissions.php

Signed-off-by: Michael Tänzer <neo@nhng.de>

Trivial merge