merge upstream
authorChristophe Simonis <chs@openerp.com>
Mon, 17 Dec 2012 17:26:14 +0000 (18:26 +0100)
committerChristophe Simonis <chs@openerp.com>
Mon, 17 Dec 2012 17:26:14 +0000 (18:26 +0100)
commit0c7f17c0ac23a0c9bf1d330ffe6b68d8f244aa78
treed0b1cd0222525108b0a2a3bdd660c650a6a8adad
parent236df95b2223adead2062a2480e38597d3c53b80
parent39fe69babe7e2f05330de6829a2843f91a04f440
merge upstream

bzr revid: chs@openerp.com-20121217172614-3z1pstu5th26wuuc
openerp/addons/base/__openerp__.py
openerp/addons/base/module/module.py
openerp/addons/base/res/res_config.py
openerp/cli/server.py
openerp/service/web_services.py
openerp/tools/osutil.py