[MERGE]Merged with lp:~openerp-dev/openobject-addons/trunk-google-doc-integration...
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 4 Mar 2013 05:24:47 +0000 (10:54 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Mon, 4 Mar 2013 05:24:47 +0000 (10:54 +0530)
bzr revid: dhr@tinyerp.com-20130304052447-0kadstbycb9ijqs2


Trivial merge