Merge branch 'master' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 20 Oct 2010 17:24:36 +0000 (20:24 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 20 Oct 2010 17:24:36 +0000 (20:24 +0300)

Trivial merge