Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh

diff --combined config/rootfiles/core/49/filelists/files
index 6bc22d450dd167f3f893a96ac81d11b5f459b6db,d4ff5e242c6a191b19f79399d10083452616611d..ed587ee921d85e8f403e9934bc2c08aff787b51a
--- 1/config/rootfiles/core/49/filelists/files
--- 2/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@@ -1,4 -1,2 +1,5 @@@
  etc/system-release
 +var/ipfire/backup/bin/backup.pl
 +srv/web/ipfire/cgi-bin/ids.cgi
 +srv/web/ipfire/cgi-bin/pppsetup.cgi
+ srv/web/ipfire/cgi-bin/proxy.cgi