Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a775270d9b028c8d616c9a63bd9dce3242d9f519 https://github.com/phpmyadmin/phpmyadmin/commit/a775270d9b028c8d616c9a63bd9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-09-25 (Wed, 25 Sep 2013) Changed paths: M ChangeLog M tbl_tracking.php Log Message: ----------- bug #4103 Tracking report: cannot delete a statement Commit: 6706fc1f9a7e8893cbe2672e9f26b30b3c49da52 https://github.com/phpmyadmin/phpmyadmin/commit/6706fc1f9a7e8893cbe2672e9f2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-09-25 (Wed, 25 Sep 2013) Changed paths: M ChangeLog M libraries/tbl_tracking.lib.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ea36bf626a96...6706fc1f9a7e