[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 11 Jul 2012 05:01:05 +0000 (10:31 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 11 Jul 2012 05:01:05 +0000 (10:31 +0530)
commitf397081dce10375a6d8692f554a8049bc5bf915d
treea5d56183719c624d4db4ea8559494ebdb1633da0
parenta3e93d51047ab2848ca15c2e0f4003bd6688553f
parentb8593b72cd48c93f195d3b00c6fbdc311913522e
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120711050105-u25nvaztam6jac6d