[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 07:04:34 +0000 (12:34 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 07:04:34 +0000 (12:34 +0530)
commit8efd186276b6f6a2b63994e980a0050335b22773
treedc65527341f4d3c938d97cb3be3650db41eaf9ea
parentde9f0c9777800cb398afddc8466c6a5c9ea3056e
parent1429f432f3c32247ada7d7c6efe1a63834b9021e
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120903051925-r01yx7u7nvono353
bzr revid: fka@tinyerp.com-20120903070434-on2thgronzgnk5am