Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 23 Nov 2013 22:20:10 +0000 (23:20 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 23 Nov 2013 22:20:10 +0000 (23:20 +0100)

Trivial merge