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

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

diff --cc config/rootfiles/core/29/filelists/files
index c969afedef1aa88012991ced5517e9fa6c80162a,9b62cc76389298729d6495631792079f2860cfd0..bba4e40d9e1c10a32601db0bd6528b423d6de62a
--- 1/config/rootfiles/core/29/filelists/files
--- 2/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@@ -3,7 -3,10 +3,10 @@@ etc/system-releas
  srv/web/ipfire/cgi-bin/credits.cgi
  srv/web/ipfire/cgi-bin/ids.cgi
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
 -srv/web/ipfire/blob.gif
 -srv/web/ipfire/images/info.gif
 -srv/web/ipfire/images/openvpn.gif
 +srv/web/ipfire/html/blob.gif
 +srv/web/ipfire/html/images/info.gif
 +srv/web/ipfire/html/images/openvpn.png
  var/ipfire/menu.d/50-firewall.menu
+ lib/firmware/av7110/bootcode.bin
+ var/ipfire/backup/include
+ etc/rc.d/init.d/networking/red