Merge branch 'master' into savagex/techassault
authorFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 17:26:55 +0000 (19:26 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 17:26:55 +0000 (19:26 +0200)

Trivial merge