Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 19 Oct 2011 12:43:24 +0000 (14:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 19 Oct 2011 12:43:24 +0000 (14:43 +0200)

Trivial merge