Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 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!