[MERGE]: with main
authorajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 20 Jan 2014 05:14:07 +0000 (10:44 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 20 Jan 2014 05:14:07 +0000 (10:44 +0530)
commit5cd399721d25fe2041e9c57ac4e168721fe9c37a
tree04dcacbdd373c99d0d595fd6bbe258a22c803a51
parentb6f2b043583f4d6aa9f7607b912259f0acc7d03a
parent57505a1b2477110976c7fc69f5e3a29f4d064651
[MERGE]: with main

bzr revid: aja@tinyerp.com-20140120051407-qor80rgyq7ll4xwp
addons/website/views/snippets.xml