[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 5122 revid:dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Tue, 6 May 2014 12:17:55 +0000 (14:17 +0200)
committerDenis Ledoux <dle@openerp.com>
Tue, 6 May 2014 12:17:55 +0000 (14:17 +0200)
commitfbbefe43c037f8b083ba47486ea256eb7cdbcb15
tree2363c29a0628a0d85a41c24747ffa76f00ddeaf6
parentae6a0fcb735a9b75f9c379377ecb5346297be66d
parentb882dd71099911743d15bc5bf9f99b22dcc4078c
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 5122 revid:dle@openerp.com-20140506121627-4oyw4zl4o6azy73w

bzr revid: dle@openerp.com-20140506121755-15gj3h43oqof6xx9
openerp/addons/base/res/res_users.py
openerp/tools/convert.py