[MERGE] lp:~openerp-dev/openobject-addons/6.0-opw-57637-ira
authorStephane Wirtel <stw@openerp.com>
Fri, 6 Jan 2012 14:47:21 +0000 (15:47 +0100)
committerStephane Wirtel <stw@openerp.com>
Fri, 6 Jan 2012 14:47:21 +0000 (15:47 +0100)
commit5efa951947aa108e883ccbde9a1e7a928e1a6313
treee73d4a203d14f0ca6039fb55945122252c09f574
parenteb8e38249d27b7fcbcadae745c5d673739bf695f
parent67f1a9bc0503b0f958596209f1786b1473169bdb
[MERGE] lp:~openerp-dev/openobject-addons/6.0-opw-57637-ira

bzr revid: stw@openerp.com-20120106144721-5ttbg397xk8jhv32