Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 13 Mar 2016 11:50:28 +0000 (12:50 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 13 Mar 2016 11:50:28 +0000 (12:50 +0100)
1  2 
wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
wcfsetup/setup/db/install.sql

Simple merge