Merge branch 'master' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 23 Oct 2010 09:19:29 +0000 (12:19 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 23 Oct 2010 09:19:29 +0000 (12:19 +0300)

Trivial merge