[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 29 May 2012 04:56:38 +0000 (10:26 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 29 May 2012 04:56:38 +0000 (10:26 +0530)
commit3e09ac5a106eacc715a1ff149291223e0bd51c52
treec569072a22b8bf32145808f9995175f7ebc1bed2
parente8bf2fda8ed49ba8a4982a276df1d764debfd2fd
parent099c4e574a5f11720c162216efb88cec48380be1
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120529045638-oz0z41owcs51cmpn