merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 5 Dec 2012 14:37:22 +0000 (15:37 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 5 Dec 2012 14:37:22 +0000 (15:37 +0100)
commit69d057efc50e7ace6a76da539efcf3570b5ad401
tree6e3e607c9dd06ecc59ad3edac78184787eeeabeb
parent3ff3f1f87fd50d363a1a0b502a34208966b24e0a
parent8dbee5c4735b381490ee51a66d7cbbbd31ea3f22
merge upstream

bzr revid: chs@openerp.com-20121201003326-j6n5r8juz16752j5
bzr revid: chs@openerp.com-20121204165557-u1oxocye3la4r6gf
bzr revid: chs@openerp.com-20121205143722-olswf8gsg8mhref3
openerp/addons/base/module/module_view.xml
openerp/cli/server.py
openerp/modules/module.py
openerp/service/__init__.py
win32/setup.py