Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Tue, 8 Mar 2016 18:25:51 +0000 (19:25 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 8 Mar 2016 18:25:51 +0000 (19:25 +0100)

Trivial merge