[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:36 +0000 (09:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:36 +0000 (09:45 +0200)
commit90d82b9fa6e527312b455dedd35941235a4f0b00
treef4692a72ea6a0279008a10469192c3852636b846
parent9c88589286a6827c09ebea836891913bc61e35c5
parent7561f48578199a242da052401318055130752c12
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130425143845-si7n2luxdqpixjlf
bzr revid: tde@openerp.com-20130426074536-sto6625nzcbtdbah