[MERGE] merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
authorYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 16 Feb 2011 04:48:02 +0000 (10:18 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 16 Feb 2011 04:48:02 +0000 (10:18 +0530)
commitd524798873752dfbe58d6334dfdc194b4ad2cbe4
treea5cd84b534fb0cf8e3e566e5d715b5a2d4ec6219
parentdb7a8f267c17dbc314c821b8f98c3a33865d8f70
parent8d1bdca7b55ac107e6201c308ff3023d074960b7
[MERGE] merge with lp:~openerp-dev/openobject-addons/emails-framework-addons

bzr revid: ysa@tinyerp.com-20110216044802-myhdwkfp4owr4d2x