[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Thu, 17 Apr 2014 13:01:44 +0000 (15:01 +0200)
committerGery Debongnie <ged@openerp.com>
Thu, 17 Apr 2014 13:01:44 +0000 (15:01 +0200)
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks

1  2 
addons/sale/sale_view.xml

Simple merge