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)
commita45b2c6b90454854c6af03be6bfc619915288c1a
treea1d3fc7d21853e216830f741c1f7e0c213e55558
parent143f52039500a420a42ee53d1ef5a411930c9d00
parent7b2948c3bcf9da7de528c6ef76e54d8821133450
merge upstream

bzr revid: chs@openerp.com-20140117092206-ha47ryhjc4ph50nl
openerp/addons/base/ir/ir_attachment.py
openerp/tools/translate.py