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

Trivial merge