merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 17:38:27 +0000 (19:38 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 17:38:27 +0000 (19:38 +0200)
commitb698ba6e290c04bbe7d1d0b8c787bcbd4524db03
treee83c4f61097d1744275463efef2555f78e0e7ab9
parente239a8c3d4e9abf24c2d42c7b09de34d6d3340e7
parent88525993ee9d2faed13d7e234ecdd5dcfbcdf0ad
merge

bzr revid: fp@fp-laptop-20110917173827-8ccsfwycvelvh4bi
addons/sale_margin/sale_margin.py