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

Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php

themes/darkblue_orange/css/theme_right.css.php

@@ -3,7 +3,6 @@
 /**
  * main css file from theme Darkblue Orange
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */

themes/darkblue_orange/info.inc.php

@@ -3,7 +3,6 @@
 /**
  * Theme information
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */

themes/darkblue_orange/layout.inc.php

@@ -4,7 +4,6 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */

themes/original/css/theme_left.css.php

@@ -3,7 +3,6 @@
 /**
  * navigation css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */

themes/original/css/theme_print.css.php

@@ -3,7 +3,6 @@
 /**
  * print css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */

themes/original/css/theme_right.css.php

@@ -3,7 +3,6 @@
 /**
  * main css file from theme Original
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */

themes/original/info.inc.php

@@ -3,7 +3,6 @@
 /**
  * Theme information
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */

themes/original/layout.inc.php

@@ -4,7 +4,6 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */