Merge branch 'master' into 'master'

Marius Cramer

2015-07-09 e2963947c8428a8bae4a013e8c88dc4bdf299075

 server/mods-available/monitor_core_module.inc.php

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

   function process() {
   }

}

?>