merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 8 Jan 2013 09:06:24 +0000 (10:06 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Tue, 8 Jan 2013 09:06:24 +0000 (10:06 +0100)
commit4db73a4c7c2d0d0cbba625c996c45e734c740f13
tree293994aa03f4949fbf29ff97182fadc137231f21
parent36cc0540cbd6f90078556050361a03a59cee75e6
parent721297135978a33fd4ca4719a4836291bfccd4f2
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20130108090624-cubi563m34f1j6ab
openerp/addons/base/i18n/ro.po
openerp/cli/server.py
openerp/service/__init__.py
openerp/service/wsgi_server.py
openerp/tools/config.py