Merge remote branch 'origin/fruitiex/runningmanctf'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 10:18:25 +0000 (11:18 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 10:18:25 +0000 (11:18 +0100)

Trivial merge