[MERGE] forward port of branch 9.0 up to 928bc26

5 files changed, 48 insertions, 5 deletions

diff --git a/doc/api_integration.rst b/doc/api_integration.rst
index 5a38f5f21fd..172eb0f3fa4 100644
--- a/doc/api_integration.rst
+++ b/doc/api_integration.rst
@@ -705,7 +705,7 @@ Search and read
 ---------------
 
 Because it is a very common task, Odoo provides a
-:meth:`~openerp.models.Model.search_read` shortcut which as its name notes is
+:meth:`~openerp.models.Model.search_read` shortcut which as its name suggests is
 equivalent to a :meth:`~openerp.models.Model.search` followed by a
 :meth:`~openerp.models.Model.read`, but avoids having to perform two requests
 and keep ids around.
diff --git a/doc/cla/corporate/AetnaSoftwares.md b/doc/cla/corporate/AetnaSoftwares.md
new file mode 100644
index 00000000000..406727bfb04
--- /dev/null
+++ b/doc/cla/corporate/AetnaSoftwares.md
@@ -0,0 +1,13 @@
+France, 2016-05-30
+
+Aetna Softwares. agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Olivier Oriol aetna.softwares@gmail.com https://github.com/aetna-softwares
+
+List of contributors:
+
+Olivier Oriol aetna.softwares@gmail.com https://github.com/aetna-softwares
diff --git a/doc/cla/corporate/devcocolombia.md b/doc/cla/corporate/devcocolombia.md
new file mode 100644
index 00000000000..3ef6e397168
--- /dev/null
+++ b/doc/cla/corporate/devcocolombia.md
@@ -0,0 +1,15 @@
+Colombia, 2016-04-20
+
+DevCO Colombia agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+David Arnold dar@devco.co https://github.com/blaggacao
+
+List of contributors:
+
+Juan Pablo Arias jpa@devco.co https://github.com/kurkop
diff --git a/doc/cla/corporate/grap.md b/doc/cla/corporate/grap.md
new file mode 100644
index 00000000000..b9a081dab57
--- /dev/null
+++ b/doc/cla/corporate/grap.md
@@ -0,0 +1,15 @@
+France, May 22, 2016
+
+GRAP agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Sylvain LE GAL sylvain.legal@grap.coop https://github.com/legalsylvain
+
+List of contributors:
+
+Sylvain LE GAL sylvain.legal@grap.coop https://github.com/legalsylvain
diff --git a/doc/cla/corporate/therp.md b/doc/cla/corporate/therp.md
index 428ecb2b411..e9f7dfae3ba 100644
--- a/doc/cla/corporate/therp.md
+++ b/doc/cla/corporate/therp.md
@@ -1,5 +1,7 @@
 Netherlands, 2015-03-09
 
+Updated 2016-05-27
+
 Therp BV agrees to the terms of the Odoo Corporate 
 Contributor License Agreement v1.0.
 
@@ -8,14 +10,12 @@ this declaration.
 
 Signed,
 
-*  Ronald Portier rportier@therp.nl https://github.com/nl66278
-*  Stefan Rijnhart stefan@therp.nl https://github.com/stefanrijnhart
+*  Ronald Portier ronald@therp.nl https://github.com/nl66278
 
 List of contributors:
 
 *  Giovanni Capalbo giovanni@therp.nl https://github.com/gfcapalbo
 *  Holger Brunn hbrunn@therp.nl https://github.com/hbrunn
 *  Lara Freeke lfreeke@therp.nl https://github.com/lfreeke
-*  Ronald Portier rportier@therp.nl https://github.com/nl66278
-*  Stefan Rijnhart stefan@therp.nl https://github.com/stefanrijnhart
+*  Ronald Portier ronald@therp.nl https://github.com/nl66278