Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 28 Jul 2011 22:02:33 +0000 (00:02 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 28 Jul 2011 22:02:33 +0000 (00:02 +0200)
Conflicts:
scripts/mass-revoke.php

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

Trivial merge