[MERGE]Merge with Parent
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 17 Jan 2014 06:20:56 +0000 (11:20 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 17 Jan 2014 06:20:56 +0000 (11:20 +0500)
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj

1  2 
addons/email_template/wizard/mail_compose_message.py
addons/website/views/snippets.xml

Simple merge