[MERGE]Merged with lp:~openerp-dev/openobject-addons/trunk-google-doc-integration...
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 28 Feb 2013 08:51:42 +0000 (14:21 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Thu, 28 Feb 2013 08:51:42 +0000 (14:21 +0530)
commitd9966b45d88b6f4cb03c9565907265c92c78045a
treef679c341cc2d91a0ed323c8837b5a9bce7ff80cd
parent5b68aa7d83c25e635f5c2c44be7334e9c6dd22b1
parent0852ebc8729bf39ec7c9d4ae3d9053d7cf7358c8
[MERGE]Merged with lp:~openerp-dev/openobject-addons/trunk-google-doc-integration-dhr-create-template-rpr

bzr revid: dhr@tinyerp.com-20130228085142-1ij3lujrp7e6kvgh