[MERGE] Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
authorYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 9 Feb 2011 07:05:16 +0000 (12:35 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 9 Feb 2011 07:05:16 +0000 (12:35 +0530)
commit25d6bc3f95c6a90fd535a791de98b5020e7e95e8
tree488988df77352021645e4a0f17614fc2f3829c49
parented0ed68dbfbacc6887c30988f745e45ab3da55f7
parent7b6e366a5f8b5bb81a4ac7c3f7b2b5b17d4122ad
[MERGE] Merge with lp:~openerp-dev/openobject-addons/emails-framework-addons

bzr revid: ysa@tinyerp.com-20110209070516-yfqydt9y21qk40mx