merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 12:03:40 +0000 (14:03 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 12:03:40 +0000 (14:03 +0200)
bzr revid: fp@tinyerp.com-20110917120340-b50aw2dcsr7dysh3

1  2 
addons/stock/stock_view.xml

Simple merge