Merge branch 'master' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-lappy.(none)>
Tue, 2 Nov 2010 13:27:52 +0000 (15:27 +0200)
committerFruitieX <rasse@rasse-lappy.(none)>
Tue, 2 Nov 2010 13:27:52 +0000 (15:27 +0200)

Trivial merge