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

Trivial merge