[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 28 Jun 2012 06:07:16 +0000 (11:37 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 28 Jun 2012 06:07:16 +0000 (11:37 +0530)
commit56d3c79c26cf16506f6e812b80a9b0a9e5d4ce6b
treea19caca430e143fdaa66f67f8f60a8ad067b06aa
parent4ccc5f1bdff41ec0d5eda03469dd336a0c3b6d10
parent997fe404b317ca0e963cf5a59c38bc6f524702b0
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120628060716-x57337bnfolq9uro