Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

 server/mods-available/monitor_core_module.inc.php

@@ -41,7 +41,6 @@

   function process() {
   }

}

?>