Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 92f022caeb639c20a8bd2d83a34c991380011649
https://github.com/phpmyadmin/phpmyadmin/commit/92f022caeb639c20a8bd2d83a34c991380011649
Author: Marc Delisle <m...@infomarc.info>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M export.php
Log Message:
-----------
Fix merge conflicts
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
