Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 2 Nov 2011 17:17:24 +0000 (18:17 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 2 Nov 2011 17:17:24 +0000 (18:17 +0100)

Trivial merge