[MERGE]: with trunk
authorajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 7 Oct 2013 05:45:29 +0000 (11:15 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Mon, 7 Oct 2013 05:45:29 +0000 (11:15 +0530)
bzr revid: aja@tinyerp.com-20131007054529-3nlgi9szgaen4kau

1  2 
addons/mail/static/src/js/mail.js
addons/portal/portal_data.xml

Simple merge
Simple merge