Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 24 Mar 2014 16:17:39 +0000 (17:17 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 24 Mar 2014 16:17:39 +0000 (17:17 +0100)

Trivial merge