[MERGE]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 12 Mar 2013 04:58:19 +0000 (10:28 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Tue, 12 Mar 2013 04:58:19 +0000 (10:28 +0530)
commit1a6b8194bf810801c28cdd2e7de13efdd164aaa2
tree1ac5f333a5dbbffdad22c3b1b19b7c26cb49b89d
parenta0585bf07c1a7b5995a6fe0b5ad6b5a7964c3048
parentd2b66d7f249b27d20c55cbbf6f9cd090175ebb1e
[MERGE]Merged with trunk

bzr revid: dhr@tinyerp.com-20130312045819-f5srzlk7919m30a1