Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Wed, 1 Dec 2010 17:16:31 +0000 (19:16 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 1 Dec 2010 17:16:31 +0000 (19:16 +0200)

Trivial merge