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

Trivial merge