[MERGE] upsteam
authorFabien Meghazi <fme@openerp.com>
Fri, 9 May 2014 14:46:08 +0000 (16:46 +0200)
committerFabien Meghazi <fme@openerp.com>
Fri, 9 May 2014 14:46:08 +0000 (16:46 +0200)
commit7caabb8f75b279d3a50b0a2587a4df967da81e28
treeb8530f27efaa45b4fc32a94be985892ca06b443f
parent69a93b07c7626fc0986498dff5951199be60b78d
parentb9c62c7adb7480b4fdf7a038e2f43a7c788afd80
[MERGE] upsteam

bzr revid: fme@openerp.com-20140509144608-btah4s8zorzon2jo