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

diff --combined config/rootfiles/core/29/filelists/files
index 579f0ccb0df3e7d7f9dfec66c88ae4f62bab1d44,79b3e9624c1d44322702e233923b50cb740fbebb..5c404888d59bf2324907559ee065ca443a92f41e
--- 1/config/rootfiles/core/29/filelists/files
--- 2/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@@ -14,7 -14,7 +14,8 @@@ var/ipfire/backup/includ
  var/ipfire/langs/list
  var/ipfire/langs/de.pl
  var/ipfire/langs/en.pl
 +var/ipfire/mac/settings
  var/ipfire/menu.d/50-firewall.menu
  var/ipfire/menu.d/30-network.menu
  srv/web/ipfire/cgi-bin/mac.cgi
+ srv/web/ipfire/html/images/indicator.gif