[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)
commit722aee53361ce7275964ef24b065d0c3755dc12a
treebf21082e0625640b71ab3a7f1bb4b7e0dbbed6d9
parentc0ce2251224f8cead576aeb73a79af64c29709ef
parentc25333099338c3a9c03d6b8950f098af42e9cf77
[MERGE]Merge with Parent

bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
addons/email_template/wizard/mail_compose_message.py
addons/website/views/snippets.xml