[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 31 Jul 2012 04:06:06 +0000 (09:36 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 31 Jul 2012 04:06:06 +0000 (09:36 +0530)
commit6fca6a2f9c3d5a6e6c0810b04cf2c372def80468
treeb9cda52e5363c5ad9a16f15ba4204f8fd860e198
parentdf01cb6bc1b807957ec44c857411b8e738588b32
parent1fc30258ff1b48a6a803aa3eb74409a059a4afff
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120731040606-tsrf34j0sijd2lwi