Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Sun, 29 Nov 2015 11:45:02 +0000 (12:45 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 29 Nov 2015 11:45:02 +0000 (12:45 +0100)

Trivial merge