merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 31 Oct 2012 13:26:38 +0000 (14:26 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 31 Oct 2012 13:26:38 +0000 (14:26 +0100)
commit478319c3ed11fd225e3ddb85a7749513ff671cc0
tree98cb69099d0b609c2fce7a90d3e1ca5729ea0bea
parent9cdc77b6ea22a9ccafde9ce6e7e65c9d08d75353
parent3c28326317bde6e52c7607642ba76b641f91da88
merge upstream

bzr revid: chs@openerp.com-20121031132638-nc2o9v0gnonl5l7l
openerp-server
openerp/addons/base/module/module_view.xml
openerp/addons/base/res/res_config.py