Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 19 Oct 2011 13:48:07 +0000 (15:48 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 19 Oct 2011 13:48:07 +0000 (15:48 +0200)

Trivial merge