[MERGE] Fwd-port of 7.0 up to 3d31341
authorOlivier Dony <odo@openerp.com>
Tue, 1 Jul 2014 10:28:55 +0000 (12:28 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 1 Jul 2014 10:28:55 +0000 (12:28 +0200)
1  2 
addons/web_linkedin/web_linkedin.py
openerp/addons/base/res/res_partner.py
openerp/report/render/rml2pdf/trml2pdf.py

Simple merge