[MERGE]
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 12:48:58 +0000 (14:48 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 29 Sep 2012 12:48:58 +0000 (14:48 +0200)
commit6eb99a4c09bbb27e90477d57d13f5ffa1a775a65
tree27eb7da4b2c292367b32d5ab2758c69b2167733b
parent190b7d3f0113b6a4a5468a23df94e35d876275ac
parentc1c8e49fc18084c11b2472041499553abd2c89dc
[MERGE]

bzr revid: fp@tinyerp.com-20120929124858-3tpm1368ovd65fcf
addons/stock/stock.py