Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

 server/mods-available/monitor_core_module.inc.php

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

   function process() {
   }

}

?>