Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 11 Mar 2014 20:31:17 +0000 (21:31 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 11 Mar 2014 20:31:17 +0000 (21:31 +0100)

Trivial merge