Merge remote branch 'origin/master' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 13:59:13 +0000 (16:59 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 13:59:13 +0000 (16:59 +0300)

Trivial merge