[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)
bzr revid: dhr@tinyerp.com-20130227073227-5xc6196f994bv5kt


Trivial merge