[MERGE]Merged with 7.0
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 29 May 2013 10:57:24 +0000 (16:27 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 29 May 2013 10:57:24 +0000 (16:27 +0530)
commit1d44d4276cd798fdb75314425b8c763388c6264c
tree4c4b175db2de463848b47247e44caeb569d22068
parentbc514fa89c67aef1730abea9ba519878b5ddb33f
parentab85cf0e866360d0649c128c3efa08e4f404c0a8
[MERGE]Merged with 7.0

bzr revid: dhr@tinyerp.com-20130529105724-edgntayd2d9fnhka