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)
commitd378e1f64b257c431f4f76986a123715e46ea888
treee45b647acc854a4ceb7746a3a33632ebf49d4ef7
parentb5f3bc91b5aa68c9805acb2786c11af4aaa2bd9f
parent983a7dced2bc15cfb5760b81659bc72fb39b2567
Merge branch 'tarballs' into release

Conflicts:
scripts/mass-revoke.php

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