Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/sites/database_edit.php

@@ -262,7 +262,6 @@
               }
               unset($tmp);
            }

         }
      } else {
         // check if client of database parent domain is client of db user!