Merge remote branch 'origin/master' into fruitiex/runningmanctf
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:16:04 +0000 (12:16 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:16:04 +0000 (12:16 +0200)

Trivial merge