Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 348c7d734ad48d8991ae33e3328a1f763b0ceac2 https://github.com/phpmyadmin/phpmyadmin/commit/348c7d734ad48d8991ae33e3328a... Author: Marc Delisle marc@infomarc.info Date: 2015-11-21 (Sat, 21 Nov 2015)

Changed paths: M js/messages.php

Log Message: ----------- Fix incorrect message calling

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 1defe1a68ad7b1d3d4eed7d8b0282e9953b01ba8 https://github.com/phpmyadmin/phpmyadmin/commit/1defe1a68ad7b1d3d4eed7d8b028... Author: Marc Delisle marc@infomarc.info Date: 2015-11-21 (Sat, 21 Nov 2015)

Changed paths: M js/messages.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/565e4eb077d0...1defe1a68ad7