Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 2 Dec 2010 14:08:05 +0000 (16:08 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 2 Dec 2010 14:08:05 +0000 (16:08 +0200)

Trivial merge