Merge remote branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Fri, 24 Dec 2010 01:00:53 +0000 (03:00 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 24 Dec 2010 01:00:53 +0000 (03:00 +0200)

Trivial merge