Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000 (06:45 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 05:45:08 +0000 (06:45 +0100)
1  2 
com.woltlab.wcf/templates/recaptcha.tpl
wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
wcfsetup/install/lang/en.xml

Simple merge