[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Tue, 15 Oct 2013 11:11:06 +0000 (13:11 +0200)
committerXavier Morel <xmo@openerp.com>
Tue, 15 Oct 2013 11:11:06 +0000 (13:11 +0200)
commit705e34b7a7530489700974c2dc0195dfb8b1c6ce
tree6585c3fbcbd868b4f9c2e06416618b9121948bcd
parentb475e002bb5c64a119f47e6a1f3374f460f093db
parente0493cd6d4cb7a99e3922308bb99cec62dc760af
[MERGE] from trunk

bzr revid: xmo@openerp.com-20131015111106-f6kaa0a5py3ph0xn