Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorMarcel Werk <burntime@woltlab.com>
Sat, 9 Jan 2016 18:44:24 +0000 (19:44 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 9 Jan 2016 18:44:24 +0000 (19:44 +0100)

Trivial merge