Merge branch 'master' into fruitiex/stormkeep
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:20:20 +0000 (17:20 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:20:20 +0000 (17:20 +0200)

Trivial merge