Merge branch 'master' into fruitiex/ctsfix
authorFruitieX <fruitiex@gmail.com>
Thu, 9 Dec 2010 21:19:10 +0000 (23:19 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 9 Dec 2010 21:19:10 +0000 (23:19 +0200)

Trivial merge