summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authordle@openerp.com <>2012-12-20 16:35:10 +0100
committerdle@openerp.com <>2012-12-20 16:35:10 +0100
commiteed9b471adec4213e619731c773b0aa1805823ff (patch)
tree6f8e882e21e2e691c139d6162f724ce6bde6ac1b /addons/plugin/plugin_handler.py
parent53e0bbf2e66bff756ad476fffc61683f729b6b14 (diff)
parentc2b5c3305b1c4c7c33996b8458b64fc240684542 (diff)
[MERGE]Latest trunk
bzr revid: dle@openerp.com-20121220153510-5n7rxd0ih3ed50ph
Diffstat (limited to 'addons/plugin/plugin_handler.py')
-rw-r--r--addons/plugin/plugin_handler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 95fe80f3b29..0664af1c92e 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -4,7 +4,7 @@ Created on 18 oct. 2011
@author: openerp
'''
-from osv import osv, fields
+from openerp.osv import fields, osv
class plugin_handler(osv.osv_memory):
_name = 'plugin.handler'