[MERGE]: merging with the same branch
authorAmit Dodiya (OpenERP) <ado@tinyerp.com>
Mon, 25 Jul 2011 11:22:57 +0000 (16:52 +0530)
committerAmit Dodiya (OpenERP) <ado@tinyerp.com>
Mon, 25 Jul 2011 11:22:57 +0000 (16:52 +0530)
commitd77321f3f6cfb966a044754fb08c76a3e9003d38
tree267de50706d796410676d0eaba483316c3f591c7
parente7ee02406f4a9f3fb70d1963c0e02b1bd66ce874
parent1dbc083383d0c682404b2add64b0c501e5a43ff2
[MERGE]: merging with the same branch

bzr revid: ado@tinyerp.com-20110725112257-sji7n6pwkcwyetws