Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5ca7f19d05a64009fb6434e4cc79ca7428eceaf0 https://github.com/phpmyadmin/phpmyadmin/commit/5ca7f19d05a64009fb6434e4cc79... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-14 (Thu, 14 May 2015)

Changed paths: M ChangeLog M libraries/plugins/auth/swekey/swekey.php

Log Message: ----------- Invalid value for CURLOPT_SSL_VERIFYPEER

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

Commit: 85f62badead5a1ee6af2fedeb0e565b749280b9a https://github.com/phpmyadmin/phpmyadmin/commit/85f62badead5a1ee6af2fedeb0e5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-14 (Thu, 14 May 2015)

Changed paths: M ChangeLog M libraries/Config.class.php M libraries/url_generating.lib.php M setup/frames/form.inc.php M setup/frames/index.inc.php M setup/frames/menu.inc.php M setup/frames/servers.inc.php M setup/index.php M setup/lib/form_processing.lib.php M setup/validate.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/061483ac1f1c...85f62badead5