Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 7 Nov 2012 18:53:32 +0000 (19:53 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 7 Nov 2012 18:53:32 +0000 (19:53 +0100)

Trivial merge