From: Najlaâ <nel@tinyerp.com>
Date: Tue, 31 Jan 2012 11:03:20 +0000 (+0100)
Subject: [MERGE]
X-Git-Tag: 6.0.4-server~12^2~7
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=0e9f3609c4a23a83dfb23bee0a23a1676415cb0b;p=odoo%2Fodoo.git

[MERGE]

bzr revid: nel@tinyerp.com-20120131110320-co4qfoeqaibip3pt
---

0e9f3609c4a23a83dfb23bee0a23a1676415cb0b