Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 20 Feb 2013 23:37:56 +0000 (00:37 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 20 Feb 2013 23:37:56 +0000 (00:37 +0100)

Trivial merge