Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Sun, 21 Nov 2010 20:10:51 +0000 (22:10 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 21 Nov 2010 20:10:51 +0000 (22:10 +0200)

Trivial merge