Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

 interface/web/tools/resync_do.php

@@ -69,7 +69,7 @@
         } else {
            $temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id);
            $server_name[$server_id] = $temp['server_name'];
            unset($temp)
            unset($temp);
         }
            
         if ( isset($tmp_id) ) $server_id = rtrim($tmp_id,',');