Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorMarcel Werk <burntime@woltlab.com>
Sat, 16 Jan 2016 12:11:06 +0000 (13:11 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 16 Jan 2016 12:11:06 +0000 (13:11 +0100)

Trivial merge