Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 23 Dec 2013 22:08:51 +0000 (23:08 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 23 Dec 2013 22:08:51 +0000 (23:08 +0100)

Trivial merge