[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:20:09 +0000 (09:50 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:20:09 +0000 (09:50 +0530)
commit3c382e33daf17a95aada051417d6a6943202e946
treef3a9d4dc7a1fce08b97427cc4f4f4e664dfa1538
parent0dd077ba2ce06375e2d3152f5e9e65f05e444f5e
parent6c51450adb5bd2eca59ef8e6f8bd9f6ef3ed56e2
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120710042009-rdptl1rgymmq4lpk