[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 15:29:38 +0000 (17:29 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 15:29:38 +0000 (17:29 +0200)
commit1aaed44874c7e4406315eadd1710d84223f00076
treea6467084107c3de927470168686e2019734ed43f
parente98da6393d0ed57ca0a0dc8c2ff44113c500756f
parent4107998dccb7e8bbf0a7f4ddad2545650695e79e
[MERGE] from trunk

bzr revid: fva@openerp.com-20140428152938-ib1yl6f7lgat51vm