Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 16 Feb 2012 19:08:08 +0000 (20:08 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 16 Feb 2012 19:08:08 +0000 (20:08 +0100)

Trivial merge