[MERGE]: merging from same branch
authorMantavya Gajjar <mga@tinyerp.com>
Mon, 19 Apr 2010 21:06:35 +0000 (02:36 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Mon, 19 Apr 2010 21:06:35 +0000 (02:36 +0530)
commit5f197ef01f7f4224f5805b5dcdeecfee40aeb379
treea1d6a5b81bfe98800ef0c461b6594969f6c0b6d9
parentf2f2bde0f3c0a09c8eb0cb841d6f2171ad83c735
parente55d830a7c76e8390bd2f533370424368339da4d
[MERGE]: merging from same branch

bzr revid: mga@tinyerp.com-20100419210635-fv7bhc6474l4blc8
addons/crm/wizard/crm_send_email.py
addons/smtpclient/smtpclient_view.xml