[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 20 Sep 2012 04:03:43 +0000 (09:33 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 20 Sep 2012 04:03:43 +0000 (09:33 +0530)
commitced42b6b07a29c2c859b588003a6ba3136ea385e
tree6074f693e2b97c52d857fce78b8e4472c61f97cc
parent2218b02926142ab97dab4f8aeaeebc53a3d3d88e
parente4a91b4900a3d7e52cf72bc67c99279c7891e21c
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120920040343-o7n7otcsufy1y18l