merge upstream
authorChristophe Simonis <chs@openerp.com>
Fri, 17 Jan 2014 09:22:06 +0000 (10:22 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 17 Jan 2014 09:22:06 +0000 (10:22 +0100)
bzr revid: chs@openerp.com-20140117092206-ha47ryhjc4ph50nl

1  2 
openerp/addons/base/ir/ir_attachment.py
openerp/tools/translate.py

Simple merge