[MERGE]with main branch
authorJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Wed, 19 Mar 2014 06:35:49 +0000 (12:05 +0530)
committerJitendra Prajapati (OpenERP) <jpr@tinyerp.com>
Wed, 19 Mar 2014 06:35:49 +0000 (12:05 +0530)
commit35e9dd0aa53d360ec97e7567c5246923280dbb89
treebf7ae8d728a1c163dcfc71daf36071a865c98952
parentd6975f7ae37dd8be7d712d7afe998755960a9a78
parentedf0f26d5963a5a9736d9358bbf37b9fd7b9d5d7
[MERGE]with main branch

bzr revid: jpr@tinyerp.com-20140319063549-7jjr6i5tdqitq2jy
addons/mrp/mrp_view.xml