[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Nov 2012 04:23:11 +0000 (09:53 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 28 Nov 2012 04:23:11 +0000 (09:53 +0530)
commitc56c35f9b029d21eca98708584ccd6a56a982371
tree4c6f3fc102708081073f6633503c3bfb824fb3c5
parent8b3042e58474b39336f0c9a64f8127c114d4b94a
parenteb4d14cd86518a419dfc68e5e3c59e4672d3bc40
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121128042311-283p5q84yyum4nkb
addons/crm/crm_lead_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml