Merged revisions 3100-3175 from stable branch.

tbrehm

2012-06-07 26c0fc98b880cf148ab348aefef85ac9b087597c

 server/lib/classes/monitor_tools.inc.php

@@ -241,10 +241,12 @@
                  $data['user'][$username]['used'] += $s[2];
                  $data['user'][$username]['soft'] += $s[3];
                  $data['user'][$username]['hard'] += $s[4];
                  $data['user'][$username]['files'] += $s[5];
               } else {
                  $data['user'][$username]['used'] = $s[2];
                  $data['user'][$username]['soft'] = $s[3];
                  $data['user'][$username]['hard'] = $s[4];
                  $data['user'][$username]['files'] = $s[5];
               }
            }
         }