Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 13 Nov 2013 11:57:09 +0000 (12:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 13 Nov 2013 11:57:09 +0000 (12:57 +0100)

Trivial merge