Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c1495982ab4e0d4e705eb3f1a751ef5104862df7 https://github.com/phpmyadmin/phpmyadmin/commit/c1495982ab4e0d4e705eb3f1a751... Author: Dmitry Bakshaev dab1818@gmail.com Date: 2015-09-02 (Wed, 02 Sep 2015)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- cookie authentication: fix cookie_iv length detection with mb_string overload

Signed-off-by: Dmitry Bakshaev dab1818@gmail.com Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 73e71c68c8a9ff28a2a64753ea8f278eda6a0281 https://github.com/phpmyadmin/phpmyadmin/commit/73e71c68c8a9ff28a2a64753ea8f... Author: Marc Delisle marc@infomarc.info Date: 2015-09-02 (Wed, 02 Sep 2015)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/622e74ea4d58...73e71c68c8a9