[MERGE] merged the branch with the new google_docs module
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 23 May 2012 11:08:37 +0000 (13:08 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 23 May 2012 11:08:37 +0000 (13:08 +0200)
commit420639193d58abfc88aff63067c39f568e17c69e
treee2c1ae573b3d4b506ee8cfdc14bc676a02aa4fe3
parentd96f7a232da31d9b5f87ff2d958c6c74f2cd48f1
parent90bc5b9b329924a38fe559e73d79daaface03426
[MERGE] merged the branch with the new google_docs module

bzr revid: qdp-launchpad@openerp.com-20120523110837-g9odzkfswqzcib8r