[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 19 Jul 2012 16:42:08 +0000 (18:42 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 19 Jul 2012 16:42:08 +0000 (18:42 +0200)
commita4fba2145bf81c3fa03373bdf0478e7f020e5f65
tree7057b1e47bd270eeed819ac04db11421088a79bb
parent391a35389c42b81a5306f8954cace8a235a763bd
parent4259367638f6c4003ebdda881844b7de5860fe4d
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120718131530-a90b062c769y0u0e
bzr revid: abo@openerp.com-20120719164208-xj75h0socxc3p6jb
addons/mrp/mrp_view.xml
addons/project/project_view.xml
addons/sale/sale_view.xml
addons/stock/stock_view.xml
addons/wiki/wiki_view.xml