[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:19:07 +0000 (15:49 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:19:07 +0000 (15:49 +0530)
commit69167eed315a54608b08362e901bbef64c141865
tree87a97777b7072e785206f30477da426ce5b354df
parent3909cd326f28dfb00806f665c999ad4f7a4115a4
parentb2bccf9e5885e0b254c3b7cdcb59286da8529ade
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831101907-ksll2xf6wdjmprx1
addons/sale/sale_data.xml