[MERGE] Forward-port saas-3 up to b6acdc4
authorOlivier Dony <odo@openerp.com>
Sat, 2 Aug 2014 18:35:51 +0000 (20:35 +0200)
committerOlivier Dony <odo@openerp.com>
Sun, 3 Aug 2014 23:38:07 +0000 (01:38 +0200)
commit6f0498beecbb0e8b82be22f7d8a5e1dc37601a31
treef5b8705e61374498015273053eafaa3e74829886
parent7273474d6591f2dc62423c92eb5ec661d597716c
parentb6acdc4a74ccefb883d03f622a3815c4ee074793
[MERGE] Forward-port saas-3 up to b6acdc4