Merging trunk into testing

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@299 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl_migration.php

@@ -778,6 +778,7 @@ class Unl_Migration_Tool
                 $this->_frontier = NULL;
                 $this->_log('Error: could not connect to frontier with user ' . $this->_frontierUser . '.');
             }
+            ftp_pasv($this->_frontier, TRUE);
         }
         return $this->_frontier;
     }