[MERGE] Forward port of saas-3 branch up to revid 9093 mat@openerp.com-20140203091848...
authorMartin Trigaux <mat@openerp.com>
Mon, 3 Feb 2014 09:55:28 +0000 (10:55 +0100)
committerMartin Trigaux <mat@openerp.com>
Mon, 3 Feb 2014 09:55:28 +0000 (10:55 +0100)
bzr revid: mat@openerp.com-20140203095528-xo1u0vah94edmbub


Trivial merge