Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 server/lib/classes/monitor_tools.inc.php

@@ -62,6 +62,10 @@
            $mainver = array_filter($mainver);
            $mainver = current($mainver).'.'.next($mainver);
            switch ($mainver){
            case "16.04":
               $relname = "(Xenial Xerus)";
               $distid = 'ubuntu1604';
               break;
            case "15.10":
               $relname = "(Wily Werewolf)";
               break;