merge upstream
authorChristophe Simonis <chs@openerp.com>
Mon, 15 Oct 2012 16:26:58 +0000 (18:26 +0200)
committerChristophe Simonis <chs@openerp.com>
Mon, 15 Oct 2012 16:26:58 +0000 (18:26 +0200)
commit9a3d5cffa73f69e82af7193cac427cf1ab933d85
tree57cf83fff924bf6c0e02c5e21cb7864d86757b3b
parent9373587e5a93dd69d2bce33d4de64afb4c358a92
parent5f5b3d6391b5cb14343ca807e88a4870acce2d94
merge upstream

bzr revid: chs@openerp.com-20121015162658-z2mqao3r3p0tgjnb
openerp/addons/base/__openerp__.py