[MERGE]Merge with Parent
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Mon, 20 Jan 2014 12:28:59 +0000 (17:28 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Mon, 20 Jan 2014 12:28:59 +0000 (17:28 +0500)
commit1c127ac6b907268f83a274cacc7ee70f9a2cb4c4
treea30acdb5e970c4d4ef0cf0e297583dcad24427b3
parentffe939865136b50ec232aaf9fca8fef269c649ac
parent7651b8f7002e5a7f5e6c0aa889eb752bf6412ccd
[MERGE]Merge with Parent

bzr revid: pza@tinyerp.com-20140120122859-ody7gvh40e3ey0q2
addons/website/views/snippets.xml