[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:51:10 +0000 (16:51 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:51:10 +0000 (16:51 +0100)
commit958764e7d318e05a199b4ba66a9fcc8ce407a3e1
tree1ac20999851461d0952f4da8c763c06f6f4d4a86
parentd930115bd398c269a1071679ebb04b68eaff9476
parent1ac9b4d20d0c549be3aa51c13ae4b1448334ff5b
[MERGE] from saas-3

bzr revid: fva@openerp.com-20140210151007-saw8m1bqwnxek26x
bzr revid: fva@openerp.com-20140210155110-6obc985lc4rl3eyv