Merge branch 'wcfSetupDev' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 7 Aug 2015 23:37:09 +0000 (01:37 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 7 Aug 2015 23:37:09 +0000 (01:37 +0200)

Trivial merge