[MERGE] : merge with lp:~openerp-dev/openobject-addons/trunk-email-framework-html-rha
authorRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 15 Apr 2011 11:39:34 +0000 (17:09 +0530)
committerRifakat Haradwala (Open ERP) <rha@tinyerp.com>
Fri, 15 Apr 2011 11:39:34 +0000 (17:09 +0530)
commit464031dc828fcf2a3e95bf92c43484273c73f349
tree5be340f0d8cc82db38ad97cc35b554284121df9d
parent10bb8ca3c740933841f830830f5caebd71090b80
parentec1a1abc6cda0e2412353b1edda95c130588453d
[MERGE] : merge with lp:~openerp-dev/openobject-addons/trunk-email-framework-html-rha

bzr revid: rha@tinyerp.com-20110415113934-df1irtzr8btg9609