Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 8 Feb 2012 17:14:16 +0000 (18:14 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 8 Feb 2012 17:14:16 +0000 (18:14 +0100)

Trivial merge