[MERGE] Merged with main Addons
authorMansi Kariya (OpenERP) <mka@tinyerp.com>
Fri, 11 Apr 2014 05:33:39 +0000 (11:03 +0530)
committerMansi Kariya (OpenERP) <mka@tinyerp.com>
Fri, 11 Apr 2014 05:33:39 +0000 (11:03 +0530)
commitfcd7f025a0b16620daaa4c67b154b59169eaddce
tree9def5d4ed2085b4a72218f4ce197b7c5277ac760
parentc3869dc5fb4d5974240d6c7fc4fb5015acf0d5af
parent0152bea512d868cbb0d9adf33cdbf98bc2030a0f
[MERGE] Merged with main Addons

bzr revid: mka@tinyerp.com-20140410103213-kq36gxiih5xdmt4l
bzr revid: mka@tinyerp.com-20140411053339-yic5dugaubzbyfhq