Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 89949d61829b59f5a85151772d171b97140e2a6d https://github.com/phpmyadmin/phpmyadmin/commit/89949d61829b59f5a85151772d17... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-01 (Fri, 01 May 2015)

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

Log Message: ----------- bug #4883 Search function breaks when searching for certain combinations of backslashes and slashes

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

Commit: cd0eb0cd0a5a34e79fa609bd4bcb0618bbef8672 https://github.com/phpmyadmin/phpmyadmin/commit/cd0eb0cd0a5a34e79fa609bd4bcb... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-01 (Fri, 01 May 2015)

Changed paths: M doc/config.rst A doc/import_export.rst M doc/user.rst

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

Commit: 55fa7082a69beff09399dc601ef5e7e91a9a97ef https://github.com/phpmyadmin/phpmyadmin/commit/55fa7082a69beff09399dc601ef5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-05-01 (Fri, 01 May 2015)

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

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/545de160ab22...55fa7082a69b