Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --cc config/rootfiles/core/61/filelists/files
index 4942c1849bb585de4537dcb14e6a45eaee1e4387,56981ed01cb9a73eeb7eeb7a4e25ac21ac14efe4..1624d83b54cff03f690c77b9e490c4ee9c1cda36
--- 1/config/rootfiles/core/61/filelists/files
--- 2/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@@ -1,9 -1,9 +1,10 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/collectd
+ opt/pakfire/lib/functions.sh
  srv/web/ipfire/cgi-bin/index.cgi
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
 +srv/web/ipfire/cgi-bin/proxy.cgi
  var/ipfire/general-functions.pl
  var/ipfire/langs
  usr/sbin/redirect_wrapper