[MERGE] forward port of branch saas-2 up to revid 4984 chs@openerp.com-20131125151017...
authorChristophe Simonis <chs@openerp.com>
Mon, 25 Nov 2013 15:41:40 +0000 (16:41 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 25 Nov 2013 15:41:40 +0000 (16:41 +0100)
commitab386c0f5faca687d2c5bf9bf61da5fa8b68a70e
treedfc4684c7a0d5e6e66f7f3d0c606f9400035da25
parentbb1e256f5b24bb4fc4b64e1fa973f86a30e4bace
parent3211a29d9b79f4809e77cb072f8a23ab26fec460
[MERGE] forward port of branch saas-2 up to revid 4984 chs@openerp.com-20131125151017-lmj53bxg1pfrr4a7

bzr revid: chs@openerp.com-20131125154140-cpbk4tcdml2a3b9n
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_actions.xml
openerp/addons/base/ir/ir_model.py
openerp/addons/base/res/res_currency_data.xml
openerp/addons/base/res/res_users.py
openerp/cli/server.py
openerp/modules/loading.py
openerp/osv/fields.py