merge
authorNajlaa <nel@silver>
Tue, 9 Sep 2008 14:19:33 +0000 (16:19 +0200)
committerNajlaa <nel@silver>
Tue, 9 Sep 2008 14:19:33 +0000 (16:19 +0200)
commitd3f2859eaa09080ad7c985e263ed3e6b6feac318
tree3aaa4ca3de76ebdfc059c77e5154023c958c90dc
parenta497e0f490ac17c7ee8bb56fe1e5b602bc385980
parent4c8c90f80ca9cb92e3cc1bbd891bb803f5f806d0
merge

bzr revid: nel@silver-20080909141933-0ulernirfc3vemya
addons/stock/stock.py
addons/stock/stock_view.xml