Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 92f022caeb639c20a8bd2d83a34c991380011649 https://github.com/phpmyadmin/phpmyadmin/commit/92f022caeb639c20a8bd2d83a34c... Author: Marc Delisle <marc@infomarc.info> Date: 2013-09-03 (Tue, 03 Sep 2013) Changed paths: M export.php Log Message: ----------- Fix merge conflicts