Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 55488bf86f9ae747db602d781e0a2e8b9e030f39 https://github.com/phpmyadmin/phpmyadmin/commit/55488bf86f9ae747db602d781e0a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)

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

Log Message: ----------- bug #4631 Server selector submits two server parameter values

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

Commit: 38d180bf854347da924b4f153f29f07729c86904 https://github.com/phpmyadmin/phpmyadmin/commit/38d180bf854347da924b4f153f29... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)

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

Log Message: ----------- Merge branch 'QA_4_3'

Commit: 40aadeba7807d6a595dc8c01c7116ef751161dc8 https://github.com/phpmyadmin/phpmyadmin/commit/40aadeba7807d6a595dc8c01c711... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)

Changed paths: M po/fy.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9cc4d73c9d62...40aadeba7807