Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d956922a6195819bf0fa5b12d2b216317f0404e4 https://github.com/phpmyadmin/phpmyadmin/commit/d956922a6195819bf0fa5b12d2b2... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Remove duplicate code in SQL escaping Fixes #12508 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 86128d63f663305bd346b4ec1f89542654465d44 https://github.com/phpmyadmin/phpmyadmin/commit/86128d63f663305bd346b4ec1f89... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M ChangeLog M libraries/Util.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 6cbcc319b119b8ca5281cf78ae675ec35775c529 https://github.com/phpmyadmin/phpmyadmin/commit/6cbcc319b119b8ca5281cf78ae67... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M libraries/plugins/import/ImportShp.php Log Message: ----------- Fix function name Fixes #12505 Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8c253e91f6dd...6cbcc319b119