[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:32:43 +0000 (16:02 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:32:43 +0000 (16:02 +0530)
commit38476fa24c9d852bf7513dc6502bb0805a76b142
tree5886ea1ee9af1b73e4a72927af2821a580ec915a
parent6e8660a776fdf582535776eb5b199cd256822961
parent8ef441badb2d3e7a0d7a4650e70de27b4a8dde2d
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831103243-cyk1ujall4akan8s