Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 5 Jan 2012 15:47:09 +0000 (16:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 5 Jan 2012 15:47:09 +0000 (16:47 +0100)

Trivial merge