Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 18 Dec 2013 00:55:23 +0000 (01:55 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 18 Dec 2013 00:55:23 +0000 (01:55 +0100)

Trivial merge