Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a661c06fd63fc7db30cf9c51154aed5a028dba3c https://github.com/phpmyadmin/phpmyadmin/commit/a661c06fd63fc7db30cf9c51154a... Author: Fenn-CS fenn25.fn@gmail.com Date: 2017-04-07 (Fri, 07 Apr 2017)

Changed paths: M ChangeLog M user_password.php

Log Message: ----------- Added a locale reference for $response in PMA_getChangePassMessage() of user_password.php

Fixes #13154

Signed-off-by: Fenn-CS fenn25.fn@gmail.com Signed-off-by: Michal Čihař michal@cihar.com

Commit: 04ebb24cc820bfe61b2d59c715d525c81c34c367 https://github.com/phpmyadmin/phpmyadmin/commit/04ebb24cc820bfe61b2d59c715d5... Author: Michal Čihař michal@cihar.com Date: 2017-04-07 (Fri, 07 Apr 2017)

Changed paths: M ChangeLog M user_password.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8cb51ff8e9cb...04ebb24cc820