Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorMarcel Werk <burntime@woltlab.com>
Wed, 30 Dec 2015 13:07:35 +0000 (14:07 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 30 Dec 2015 13:07:35 +0000 (14:07 +0100)

Trivial merge