-
Committer:
Harry (Open ERP)
-
Author(s):
xrg
-
Date:
2009-11-20 14:31:04 UTC
-
mfrom:
(1119.1.208)
-
mto:
(1898.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
1900.
-
Revision ID:
hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts