Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Dec 2012 17:44:29 +0000 (18:44 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Dec 2012 17:44:29 +0000 (18:44 +0100)

Trivial merge