[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:29:09 +0000 (15:59 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:29:09 +0000 (15:59 +0530)
commit4bc80c319e5305d32abedbcaee6f6edf317f8580
treee4bd466903e57f0f059e0ec249b3f2601b7168db
parentd25ac32d1bb102a918044bee433751a161de44e9
parentb2bccf9e5885e0b254c3b7cdcb59286da8529ade
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831102909-j91bo5zhtqggrwp9
addons/stock/stock_data.xml