Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eae51ef7c73e1baefd2af00ee9da769eb255802b https://github.com/phpmyadmin/phpmyadmin/commit/eae51ef7c73e1baefd2af00ee9da... Author: Marc Delisle marc@infomarc.info Date: 2016-01-06 (Wed, 06 Jan 2016)

Changed paths: M ChangeLog M libraries/DBQbe.class.php M test/classes/PMA_DBQbe_test.php

Log Message: ----------- Fixes #11780 FROM clause not generated after loading search bookmark

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

Commit: 71bf8768a022313a03f34e51efb7a24c2bea2ca4 https://github.com/phpmyadmin/phpmyadmin/commit/71bf8768a022313a03f34e51efb7... Author: Marc Delisle marc@infomarc.info Date: 2016-01-06 (Wed, 06 Jan 2016)

Changed paths: M ChangeLog M libraries/DbQbe.php M test/classes/DbQbeTest.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/46f0e4cee5fa...71bf8768a022