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

Trivial merge