Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorMarcel Werk <burntime@woltlab.com>
Tue, 22 Dec 2015 16:28:06 +0000 (17:28 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 22 Dec 2015 16:28:06 +0000 (17:28 +0100)

Trivial merge