[MERGE] Merged with main addons
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Feb 2012 13:07:00 +0000 (14:07 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Feb 2012 13:07:00 +0000 (14:07 +0100)
commit4da82cdfc9de3066a5136576b3c70cabee290fdd
tree76e613978f53b02c4b9267814e84d969da180d96
parent7516c4355534309f8b7032579f921d24ff25bab9
parentda84f36eb4c3718b1adf8110de2af339565e5dd8
[MERGE] Merged with main addons

bzr revid: tde@openerp.com-20120214130700-ednaydgc1my2ktw5
addons/delivery/delivery.py