[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Thu, 22 Nov 2012 23:42:36 +0000 (00:42 +0100)
committerAntony Lesuisse <al@openerp.com>
Thu, 22 Nov 2012 23:42:36 +0000 (00:42 +0100)
commita4e5ddcbb2a09afe301fddd95f2d259320f379f2
treedd785b65106d65ca73458764b2d826d94d0093a5
parent30ce97d206a92897df6fe4856fe148b01c587d46
parentf5254e03ff4e628322805dea41109020718e7448
[MERGE] trunk

bzr revid: al@openerp.com-20121122234236-9egsahi6g7rhmbvr
.bzrignore
doc/conf.py
openerp/addons/base/ir/ir_attachment.py