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

Trivial merge