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

Trivial merge