[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)
commitc25827f84544b6ea3004c7a354122284310c528b
tree5d54ee1942c876925aa37f20dd46945897258984
parent4208281471b2fb658623a1ad8c21cc8169aa84c3
parenta9ea8c22752b2f4b6bd651006036b611ac15a16c
[MERGE] Forward port of saas-3 branch up to revid 9093 mat@openerp.com-20140203091848-9kspakimqorltvxx

bzr revid: mat@openerp.com-20140203095528-xo1u0vah94edmbub