[MERGE]Merged lp:~openerp-dev/openobject-addons/trunk-google-doc-integration-dhr...
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 07:32:27 +0000 (13:02 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 07:32:27 +0000 (13:02 +0530)
commite765fe1ebdacf30f902e52fca3f9999a83b62840
tree6047b15eb2c4b1315a40afafe9bcc7e016615d0a
parentf06b26f4d591cab554a8939ed3a54928c0ba66e3
parent15140b69f78a354cd081699808589c90bce7eaed
[MERGE]Merged lp:~openerp-dev/openobject-addons/trunk-google-doc-integration-dhr-create-template-rpr

bzr revid: dhr@tinyerp.com-20130227073227-5xc6196f994bv5kt