[MERGE] forward port of branch saas-2 up to revid 5002 dle@openerp.com-20140114173613...
authorChristophe Simonis <chs@openerp.com>
Wed, 15 Jan 2014 20:53:57 +0000 (21:53 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 15 Jan 2014 20:53:57 +0000 (21:53 +0100)
commit0771ca26922080dc6e42a9fb63ed882b50af5168
tree4763955c04daa74d3fc41355973b1d038da8d632
parent84a840a38c2001ba5709119b4487ea750f5edc1f
parenta69f789b416ce09a01c00f576bf471223e744507
[MERGE] forward port of branch saas-2 up to revid 5002 dle@openerp.com-20140114173613-ruxye1m7fxtcjfim

bzr revid: chs@openerp.com-20140115205357-arptzm69logz3osm
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/res/res_users.py
openerp/addons/base/workflow/workflow_report.py
openerp/osv/expression.py
openerp/osv/fields.py
openerp/osv/orm.py
openerp/tests/test_mail.py
openerp/tools/translate.py