Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1e6750cbc9e91645407f7e4b4dd0e4187202b38d https://github.com/phpmyadmin/phpmyadmin/commit/1e6750cbc9e91645407f7e4b4dd0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- bug #4892 Undefined variable: unique_conditions

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

Commit: f7716754f4a045c82147b67058b55171ef75e1c0 https://github.com/phpmyadmin/phpmyadmin/commit/f7716754f4a045c82147b67058b5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M po/fr.po M po/hu.po M po/ia.po M po/nl.po M po/tr.po M test/libraries/PMA_normalization_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3e5eb604c6a2...f7716754f4a0