[MERGE] turnk
authorAntony Lesuisse <al@openerp.com>
Thu, 20 Dec 2012 02:07:08 +0000 (03:07 +0100)
committerAntony Lesuisse <al@openerp.com>
Thu, 20 Dec 2012 02:07:08 +0000 (03:07 +0100)
commit549c0118933057307b585179d850527392f4d8c1
tree5e9fbf9a6bef1a7441d2c6916261a455ba32c56d
parentfde832955ab4155087893db31aeb9ac3aa7c4466
parent777ed1e0dc9b49a2b55c1f1a8260c07f46a7bacb
[MERGE] turnk

bzr revid: al@openerp.com-20121220020708-ioiaoz58ncgw5wg7
openerp/addons/base/ir/ir_attachment.py
openerp/tests/__init__.py