Merge remote-tracking branch 'jiweigert/XHTML_1.0' into core68

diff --cc config/cfgroot/header.pl
index 91b54fc3879191e2df587231ae3080ad6c482fc4,7c3682021a24cc7bfc7f3443f69078727e2be177..0f10bf9f863b843cd70128a0a275cde218cb0101
--- 1/config/cfgroot/header.pl
--- 2/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@@ -161,9 -161,10 +161,9 @@@ sub genmenu 
  
  sub showhttpheaders
  {
 -      print "Pragma: no-cache\n";
 -      print "Cache-control: no-cache\n";
 +      print "Cache-control: private\n";
        print "Connection: close\n";
-       print "Content-type: text/html\n\n";
+       print "Content-type: text/html; charset=UTF-8\n\n";
  }
  
  sub is_menu_visible($) {

diff --cc html/html/themes/ipfire/include/functions.pl
Simple merge

diff --cc html/html/themes/maniac/include/functions.pl
Simple merge