[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 10:33:07 +0000 (11:33 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 10:33:07 +0000 (11:33 +0100)
commit2378decc042b9c404441b52e26b55f700f065319
treee7ccc5494f6129d4316b958ff5e759e2aefcd3d9
parent9e801815bff8daff3e93e3305e39e635f6d4b1c2
parent0d4d9af5f4b7ca695e33af370848350b437c132e
[MERGE] from trunk

bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps