[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:35:21 +0000 (16:05 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:35:21 +0000 (16:05 +0530)
commit9bc3113890b8060d3992defcb075e62e5a7fdfb8
treeb7b83dcd1b62d08a3b285abddd63a54a9ba4ca31
parentca22d79a2107d943f1484728cdda7b6d37f43826
parent8ef441badb2d3e7a0d7a4650e70de27b4a8dde2d
[MERGE] Merge with parent branch

bzr revid: fka@tinyerp.com-20120831103521-ydpkov2mvsg0um5g