merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 6 Dec 2011 08:12:49 +0000 (09:12 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 6 Dec 2011 08:12:49 +0000 (09:12 +0100)
commit255cfb94b0456ae4e84f0a30dd164032ecf707e7
tree677ba3ef939a156a63390ed21dba14b3de703e0f
parent33767eb35605c4fcb4c5dec7cc40431f536c4558
parent4d9356f555aca96420f984dce65b7dc8d66e2078
merge

bzr revid: fp@tinyerp.com-20111206081249-olzikv2g6om6mnec
addons/mrp/mrp.py
addons/stock/stock_view.xml