Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 42bbc5e04d507bd8e864d04c69f68499755b32ef https://github.com/phpmyadmin/phpmyadmin/commit/42bbc5e04d507bd8e864d04c69f6... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.class.php

Log Message: ----------- bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 921710ec4de5ea73cb68c2f1dd6ae6ad64f5b350 https://github.com/phpmyadmin/phpmyadmin/commit/921710ec4de5ea73cb68c2f1dd6a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)

Changed paths: M js/makegrid.js

Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cea9aa968871...921710ec4de5