Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9de4ad2b0d83d7db5e97a3445b75da37f699c3c3 https://github.com/phpmyadmin/phpmyadmin/commit/9de4ad2b0d83d7db5e97a3445b75... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M import.php Log Message: ----------- Fix call to old and now undefined functions Fix #12664 Occurred due to a merge issue in 54c81312 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 92d9310ef2fbcdac4cf0b0bd49862297fb7e8c24 https://github.com/phpmyadmin/phpmyadmin/commit/92d9310ef2fbcdac4cf0b0bd4986... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-25 (Tue, 25 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12664 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c05f80214eea...92d9310ef2fb