[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:22:42 +0000 (09:52 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 10 Jul 2012 04:22:42 +0000 (09:52 +0530)
commit6a33d65ec6812680d65d89cc8e58f743d2cd6b4c
treee56748588dffcae2dfcbdf9fb18b919ce396ac34
parenta0cfd33a880833231516b501bd8c0c860bb4cf9a
parent6c51450adb5bd2eca59ef8e6f8bd9f6ef3ed56e2
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120710042242-zxe09fo9k154knad