Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php

1 files changed, 1 insertions, 1 deletions

diff --git a/import.php b/import.php
index 64756b5a02..a16f9fd191 100644
--- a/import.php
+++ b/import.php
@@ -264,7 +264,7 @@ if ($import_file != 'none' && !$error) {
                 $file_to_unlink = $import_file_new;
             }
 
-	    $size = filesize($import_file);
+            $size = filesize($import_file);
         }
     }