merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 10:44:20 +0000 (12:44 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 10:44:20 +0000 (12:44 +0200)
commit554213de325a01503743dd3a8d3c2fa63c662508
tree1873d77600210cacba1aac1e1d613d3a72413442
parentd9318e92e6a2b181f99889a98e1eefdc6d2db2bb
parent4dea5f7b7c9f85d5958ead46bba77dc3abcab899
merge

lp bug: https://launchpad.net/bugs/781642 fixed

bzr revid: fp@tinyerp.com-20110924104420-81opl9r0xrszg6u1
addons/stock/stock.py