[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

[odoo/odoo.git] / addons / document_ftp / __init__.py

diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py
index 80328b7..af514df 100644 (file)
--- a/addons/document_ftp/__init__.py
+++ b/addons/document_ftp/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import doc_conf_wizard
 import ftpserver
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: