Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Wed, 29 Oct 2014 22:42:38 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Wed, 29 Oct 2014 22:42:38 +0000 (23:42 +0100)
commitc1b4fab88a6a0d8684f5faa93f079ef3fa4b16c7
tree13387f653299761dbde998d3430f264210bac604
parentb98f9c997fb1dab28f5184dd7f88f619ace7215c
parent2b2ec0743599260d1d3215dd273a6665ab5871d3
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/stock/stock.py