Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1ce32d6e856668c8942203de0f09a07c719f3796 https://github.com/phpmyadmin/phpmyadmin/commit/1ce32d6e856668c8942203de0f09... Author: Marc Delisle marc@infomarc.info Date: 2014-01-19 (Sun, 19 Jan 2014)

Changed paths: M ChangeLog M libraries/server_privileges.lib.php

Log Message: ----------- bug #4241 Confusing dialog when trying to create an already existing user

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

Commit: 1cec103fed3d9820af270e4ba217f0acd6224025 https://github.com/phpmyadmin/phpmyadmin/commit/1cec103fed3d9820af270e4ba217... Author: Marc Delisle marc@infomarc.info Date: 2014-01-19 (Sun, 19 Jan 2014)

Changed paths: M ChangeLog M libraries/server_privileges.lib.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/54fc30d7430b...1cec103fed3d