Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Mar 2014 18:17:31 +0000 (19:17 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Mar 2014 18:17:31 +0000 (19:17 +0100)

Trivial merge