[MERGE] forward port of branch saas-2 up to revid 4992 chs@openerp.com-20131202105848...
authorChristophe Simonis <chs@openerp.com>
Mon, 2 Dec 2013 11:00:30 +0000 (12:00 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 2 Dec 2013 11:00:30 +0000 (12:00 +0100)
bzr revid: chs@openerp.com-20131127110757-5kaay2kcxq0ysb59
bzr revid: chs@openerp.com-20131127161639-yur4rdh3wx43kxle
bzr revid: chs@openerp.com-20131127180647-f8uws77gaym5kfvd
bzr revid: chs@openerp.com-20131202110030-gf20dv2uj5fqv7c2

1  2 
openerp/addons/base/res/res_config.py
openerp/addons/base/res/res_users.py
openerp/modules/loading.py
openerp/osv/orm.py

Simple merge
Simple merge
Simple merge
Simple merge