From: Najlaâ Date: Tue, 31 Jan 2012 12:45:11 +0000 (+0100) Subject: [MERGE] X-Git-Tag: 6.0.4-server~12^2~6 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=a809791dc67fc66590a1caa3c1d31c335a208862;p=odoo%2Fodoo.git [MERGE] bzr revid: nel@tinyerp.com-20120131124511-5ev3y9lx56ld8499 --- a809791dc67fc66590a1caa3c1d31c335a208862