[MERGE] merge with main addons
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 27 Mar 2012 11:05:53 +0000 (16:35 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 27 Mar 2012 11:05:53 +0000 (16:35 +0530)
commit4d7ac64a01323d1242c2e1000e00fd37dd11ae3a
tree62185fb8c0ad59edcfa4ab23d7ca09497f384823
parent2bdc0db6072e701aa3b152f4f18f1804d936f1ce
parent7d9c9efef532530d456a13fb2cccaf41effec016
[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120327110553-yuf6mlqfyswx9bme