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

diff --combined config/rootfiles/core/29/filelists/files
index d24c1367b2e8641bb9c888bee3f2487c0dc9b6d1,bba4e40d9e1c10a32601db0bd6528b423d6de62a..59bf3a10492451a74f9ba73b8b74452269d6f853
--- 1/config/rootfiles/core/29/filelists/files
--- 2/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@@ -3,11 -3,10 +3,11 @@@ 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
 +srv/web/ipfire/cgi-bin/aliases.cgi