From: Turkesh Patel (Open ERP) Date: Mon, 14 May 2012 05:44:06 +0000 (+0530) Subject: [MRG] merge with main branch X-Git-Tag: 7.0-server~3449^2~9^2 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=9f5e09b1beea71954cc33d7640353f85fca51214;p=odoo%2Fodoo.git [MRG] merge with main branch bzr revid: tpa@tinyerp.com-20120514054406-e6bb0uuy6kmj925k --- 9f5e09b1beea71954cc33d7640353f85fca51214