Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41f5f57c1f42238cd6e26650462db57fff924052 https://github.com/phpmyadmin/phpmyadmin/commit/41f5f57c1f42238cd6e26650462d... Author: Marc Delisle marc@infomarc.info Date: 2015-10-11 (Sun, 11 Oct 2015)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Fix typo

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 2d30407b919e878d6ad5303f85af1e2cfae9f7f4 https://github.com/phpmyadmin/phpmyadmin/commit/2d30407b919e878d6ad5303f85af... Author: Marc Delisle marc@infomarc.info Date: 2015-10-11 (Sun, 11 Oct 2015)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c6a200042af...2d30407b919e