[MERGE]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Mon, 10 Feb 2014 06:00:20 +0000 (11:30 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Mon, 10 Feb 2014 06:00:20 +0000 (11:30 +0530)
commitbdaccb7053693d1093df8d0ebf8c6f7a999eefb6
treebea472b86fd5059f636799ef0e00b80e92015fd5
parent8fa790a71b08b721ed9c6c77fbf00665f57b4d48
parentd8c5a1c4c2a5f3a7f11c66fdbc624485e6485489
[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
addons/mrp/mrp.py
addons/mrp/mrp_view.xml