Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files

diff --cc config/rootfiles/core/49/filelists/files
index 8a642aa7ec44d0579bec7e961e5873dc75011310,ed587ee921d85e8f403e9934bc2c08aff787b51a..0051c60f992b1c5d1f8b06b4e0b524a5261efbc0
--- 1/config/rootfiles/core/49/filelists/files
--- 2/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@@ -1,3 -1,5 +1,6 @@@
  etc/system-release
 +etc/init.d/squid
+ 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