[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 18 Sep 2012 04:28:02 +0000 (09:58 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 18 Sep 2012 04:28:02 +0000 (09:58 +0530)
commitbace03da80b1d9ca216ed14ef1719e061923c93f
tree2fe3f49c4eeba578f3b73c4452956da1c30e23ad
parente21d8c69685ff69527946855b6a68d73eeda1195
parentee2ebdd6e952b57295c482023310c11806f7862c
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120918042802-1w0ioh7kxux0kvbs