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

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

diff --cc config/rootfiles/core/47/filelists/files
index fee8ee2b063d4d89796b3c30e1eed92daf66505d,befb6bfb3558899ce6db5ab865dea5abde7883de..adbbd2970a5a061bbf6b41e4115bf753196c28fe
--- 1/config/rootfiles/core/47/filelists/files
--- 2/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@@ -1,4 -1,4 +1,6 @@@
  etc/system-release
 +etc/rc.d/init.d/sshd
  srv/web/ipfire/cgi-bin/services.cgi
 +srv/web/ipfire/cgi-bin/remote.cgi
+ srv/web/ipfire/cgi-bin/ids.cgi
+ var/ipfire/backup/include