Merge branch 'next' of github.com:WoltLab/WCF into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 16 Apr 2016 10:21:16 +0000 (12:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 16 Apr 2016 10:21:16 +0000 (12:21 +0200)

Trivial merge