[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:13:17 +0000 (10:43 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 3 Sep 2012 05:13:17 +0000 (10:43 +0530)
commitb972b8fe26908ca71c0a06448027b14f1bcfd116
tree8c37232bee985ce0a16e4cc5ac0276ec973d2862
parente5b99dca25aea687272e0e09d73d9ac034acd14c
parent7e4225b3af25af84b5ad25b1db1320be69702435
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120903051317-bq2zytg6xvp0o6mp