[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:19:36 +0000 (09:49 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:19:36 +0000 (09:49 +0530)
commit3decbfeec65569de2a813dc98133908c392b97b1
treebfddc4605e6c2d0e4c7acd6edd01606bce7fbf80
parent28063542d6c2b8884327716caa0b0ccc8f283d12
parent42ee1b52b1d83d99a1fdff6dc0bea777afbaf6cb
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120926041936-091srzosnf02pib2