Merge branch 'next' of github.com:WoltLab/WCF into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 2 Jun 2016 22:17:41 +0000 (00:17 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 2 Jun 2016 22:17:41 +0000 (00:17 +0200)

Trivial merge