merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:19:06 +0000 (18:19 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:19:06 +0000 (18:19 +0200)
bzr revid: fp@fp-laptop-20110917161906-rae6djau18h6stmq

1  2 
addons/sale_margin/sale_margin.py

Simple merge