[MERGE] trunk
authorSimon Lejeune <sle@openerp.com>
Mon, 24 Mar 2014 16:20:43 +0000 (17:20 +0100)
committerSimon Lejeune <sle@openerp.com>
Mon, 24 Mar 2014 16:20:43 +0000 (17:20 +0100)
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57

1  2 
addons/purchase/purchase.py

Simple merge