[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:09:50 +0000 (10:39 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:09:50 +0000 (10:39 +0530)
commit4cd1892a723af422a3f6f1cd8c97ef5f60ae218e
tree2c27aca3b6be8468ff08c3a3128bfad3e91e0c76
parent79a84ffc5d2afaec71225b0e70dcccb79ecc8239
parentf830a534d67cd34dc4b98f9207cbaab6fd80e966
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20121012050950-6equxe83zfxlynpg