[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Thu, 5 Jan 2012 10:14:00 +0000 (11:14 +0100)
committerRaphael Collet <rco@openerp.com>
Thu, 5 Jan 2012 10:14:00 +0000 (11:14 +0100)
commit00d6915a2347e62ff5e4761cef81bdecad9f7cf0
tree61b1e28d7555a8bcc043f273ded53f5751f8451e
parent49ab30a502bb20e91ff9d6a30e161ba6dc4aabcc
parent5602ac13b7c7cb788fc250024d0a7cd8d500b195
[MERGE] from trunk

bzr revid: rco@openerp.com-20120105101400-21xlc4c2n0dq2jur
addons/sale/__openerp__.py