[MERGE]Sync with Trunk
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Thu, 30 Jan 2014 05:54:52 +0000 (10:54 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Thu, 30 Jan 2014 05:54:52 +0000 (10:54 +0500)
bzr revid: pza@tinyerp.com-20140130055452-dntwofrc41897k1f

1  2 
addons/mrp/mrp_view.xml

Simple merge