[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5294 revid:odo@openerp.com...
authorDenis Ledoux <dle@openerp.com>
Tue, 6 May 2014 12:16:27 +0000 (14:16 +0200)
committerDenis Ledoux <dle@openerp.com>
Tue, 6 May 2014 12:16:27 +0000 (14:16 +0200)
commitb882dd71099911743d15bc5bf9f99b22dcc4078c
treeb159a1f54c45b61e2d2fc88ab777d8aed7e11258
parent6b26a3896bb255e4271994cc9bf12c3a4b32b191
parent188930bb01e93d7d142d19c2ac171814257347dc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5294 revid:odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u

bzr revid: dle@openerp.com-20140506121627-4oyw4zl4o6azy73w
openerp/addons/base/ir/ir_model.py
openerp/addons/base/res/res_users.py
openerp/tools/convert.py
openerp/tools/safe_eval.py