Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 24 Nov 2013 15:04:38 +0000 (16:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 24 Nov 2013 15:04:38 +0000 (16:04 +0100)

Trivial merge