Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Thu, 2 Oct 2014 21:42:36 +0000 (23:42 +0200)
committerOCA git bot <OCA-git-bot@therp.nl>
Thu, 2 Oct 2014 21:42:36 +0000 (23:42 +0200)
commit8825f49c4803b936aaa816ddca8efb1037864583
tree22a26e9881e2e588707aff1c87528473bfb50458
parenta1119e71346dbaf4cebf210c867676603bb7f6c3
parenteb9113c04d66627fbe04b473b9010e5de973c6aa
Merge remote-tracking branch 'odoo/7.0' into 7.0
openerp/addons/base/ir/ir_attachment.py