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

Trivial merge