[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 2 Jul 2012 04:20:45 +0000 (09:50 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 2 Jul 2012 04:20:45 +0000 (09:50 +0530)
bzr revid: mdi@tinyerp.com-20120702042045-8ldfv0x9sge84lt9


Trivial merge