Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 21 Jan 2015 12:42:55 +0000 (13:42 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 21 Jan 2015 12:42:55 +0000 (13:42 +0100)

Trivial merge