Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 22 Feb 2014 21:29:24 +0000 (22:29 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 22 Feb 2014 21:29:24 +0000 (22:29 +0100)

Trivial merge