Merge branch 'master' into 'master'

Marius Cramer

2014-06-05 4a569d979c0e5d39b7ac9cb72a02e7ac2e906962

 Merge branch 'master' into 'master'

Master

 install/lib/installer_base.lib.php

@@ -498,6 +498,13 @@
                    $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
                }

                $query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`mail_backup` TO '".$value['user']."'@'".$host."' ";
                if ($verbose){
                    echo $query ."\n";
                }
                if(!$this->dbmaster->query($query)) {
                    $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
                }
            }

            /*