Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-14 7cf3e98090a3e9f0a9cc960d07c5f259adab6a19

 interface/web/monitor/show_munin.php

@@ -58,10 +58,10 @@
      $munin_password = trim($server_config['munin_password']);
      $auth_string = '';
      if($munin_user != ''){
         $auth_string = $munin_user;
         $auth_string = rawurlencode($munin_user);
      }
      if($munin_user != '' && $munin_password != ''){
         $auth_string .= ':'.$munin_password;
         $auth_string .= ':'.rawurlencode($munin_password);
      }
      if($auth_string != '') $auth_string .= '@';