[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 2 Nov 2012 04:37:10 +0000 (10:07 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 2 Nov 2012 04:37:10 +0000 (10:07 +0530)
commit7873e7b2d328d93c982e1c5a75db0bb76d693bca
treef6bb7bb344a2644c99f3c14c765a534d8c14dfe9
parentd3466a962483c5a6a7eb94392638ccf4524c0b2a
parentb006809773df62a31663df260400c766b666c32a
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121031045834-wczrlhk4ro3ag5np
bzr revid: mdi@tinyerp.com-20121101042448-1hymng6jidkfynbf
bzr revid: mdi@tinyerp.com-20121102043710-vq1f08mni1wuoj4m