[IMP]: confliction solved
authorHardik Ansodariy (OpenERP) <han@tinyerp.com>
Tue, 26 Jul 2011 07:28:29 +0000 (12:58 +0530)
committerHardik Ansodariy (OpenERP) <han@tinyerp.com>
Tue, 26 Jul 2011 07:28:29 +0000 (12:58 +0530)
commit06af6ca94e0a3a64d04dafc486105421bb327159
tree230e42183b8cbfdc9b29f2783b87743653977bd2
parent2196d2771613f106a282a2b53cfde01f868ec13c
[IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072829-z8ysp919hoicl8b6
addons/mail_gateway/mail_gateway_view.xml