Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
This commit is contained in:
lorilee
2010-07-20 13:04:03 -07:00
329 changed files with 125970 additions and 127432 deletions

View File

@@ -4,7 +4,6 @@
* CSV import plugin for phpMyAdmin
*
* @todo add an option for handling NULL values
* @version $Id$
* @package phpMyAdmin-Import
*/
if (! defined('PHPMYADMIN')) {