Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Sun, 25 Oct 2015 10:33:25 +0000 (11:33 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 25 Oct 2015 10:33:25 +0000 (11:33 +0100)

Trivial merge