Merge remote-tracking branch 'odoo/master' into master-default-order-list-ged
authorGéry Debongnie <ged@odoo.com>
Mon, 16 Jun 2014 07:30:46 +0000 (09:30 +0200)
committerGéry Debongnie <ged@odoo.com>
Mon, 16 Jun 2014 07:30:46 +0000 (09:30 +0200)
commitabf4ca3120a28279f5860adf6321fa832d84fc7a
tree94fa92c8a3b3547bdf80fb4885b43a9d89dcd622
parentcb7450acec2d80b3503fdf7451271e3e941dfa81
parent47647c6c49fdada99add030de816792e7d442df0
Merge remote-tracking branch 'odoo/master' into master-default-order-list-ged