Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b55719206b702438e0e57d71c5cf5e974188a959 https://github.com/phpmyadmin/phpmyadmin/commit/b55719206b702438e0e57d71c5cf... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)

Changed paths: M libraries/plugin_interface.lib.php

Log Message: ----------- Remove SQL format for multi-table queries.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 4a10628d8179a18f09b0ba4c489c946c77e83981 https://github.com/phpmyadmin/phpmyadmin/commit/4a10628d8179a18f09b0ba4c489c... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)

Changed paths: M ChangeLog

Log Message: ----------- Update ChangeLog.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: e71869daf150bac82b4f2547d929630fe30a82ea https://github.com/phpmyadmin/phpmyadmin/commit/e71869daf150bac82b4f2547d929... Author: Michal Čihař michal@cihar.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M ChangeLog M libraries/plugin_interface.lib.php

Log Message: ----------- Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2

Conflicts: ChangeLog

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/15b5051928ff...e71869daf150