[IMP]: confliction solved
authorHardik Ansodariy (OpenERP) <han@tinyerp.com>
Tue, 26 Jul 2011 07:25:52 +0000 (12:55 +0530)
committerHardik Ansodariy (OpenERP) <han@tinyerp.com>
Tue, 26 Jul 2011 07:25:52 +0000 (12:55 +0530)
commit2196d2771613f106a282a2b53cfde01f868ec13c
tree1c6cc993e24df4813c7c3bd9629c7d1a5171cb7e
parent5b6285ba7abcc54b2baeb42894d81a1bc29e0adb
[IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
addons/mail_gateway/mail_gateway_view.xml