[MERGE]sync with trunk.
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Mon, 31 Mar 2014 09:29:19 +0000 (14:59 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Mon, 31 Mar 2014 09:29:19 +0000 (14:59 +0530)
commitf1eb31b758e6e95e1d45be78edcde1925a119f59
tree75d3d44fc7412a3f467fd3132d37f6de481247b7
parent16f358d9e2b67ba804bc7ccef9e69a02e73e4d49
parent035b1e8f8e579cbb888bfb8da1f50057014a3f17
[MERGE]sync with trunk.

bzr revid: dka@tinyerp.com-20140331092919-1o6xipu5ld4g5n2k
openerp/addons/base/ir/ir_ui_view.py