[FIX] website_forum: bad conflict resolution during last forward-port
[FIX] website_forum: bad conflict resolution during last forward-port

kdiff3 use should be forbidden :-)

ygol/odoo,microcom/odoo,Grirrane/odoo,alhashash/odoo,optima-ict/odoo,alhashash/odoo,Elico-Corp/odoo_OCB,Grirrane/odoo,tvtsoft/odoo8,addition-it-solutions/project-all,sysadminmatmoz/OCB,storm-computers/odoo,hip-odoo/odoo,dfang/odoo,stephen144/odoo,odoousers2014/odoo,alhashash/odoo,odoousers2014/odoo,sysadminmatmoz/OCB,microcom/odoo,optima-ict/odoo,laslabs/odoo,cdrooom/odoo,hip-odoo/odoo,bplancher/odoo,Grirrane/odoo,sysadminmatmoz/OCB,stephen144/odoo,Grirrane/odoo,hip-odoo/odoo,ygol/odoo,sysadminmatmoz/OCB,alhashash/odoo,storm-computers/odoo,dfang/odoo,mkieszek/odoo,microcom/odoo,dfang/odoo,optima-ict/odoo,mkieszek/odoo,stephen144/odoo,cdrooom/odoo,addition-it-solutions/project-all,Elico-Corp/odoo_OCB,mkieszek/odoo,tvtsoft/odoo8,dfang/odoo,syci/OCB,odoousers2014/odoo,ygol/odoo,hip-odoo/odoo,sysadminmatmoz/OCB,addition-it-solutions/project-all,mkieszek/odoo,laslabs/odoo,sysadminmatmoz/OCB,sysadminmatmoz/OCB,Grirrane/odoo,microcom/odoo,cdrooom/odoo,addition-it-solutions/project-all,ygol/odoo,syci/OCB,deKupini/erp,Elico-Corp/odoo_OCB,storm-computers/odoo,tvtsoft/odoo8,tvtsoft/odoo8,laslabs/odoo,laslabs/odoo,bplancher/odoo,mkieszek/odoo,stephen144/odoo,dfang/odoo,deKupini/erp,Grirrane/odoo,laslabs/odoo,addition-it-solutions/project-all,stephen144/odoo,hip-odoo/odoo,bplancher/odoo,hip-odoo/odoo,bplancher/odoo,microcom/odoo,addition-it-solutions/project-all,alhashash/odoo,mkieszek/odoo,deKupini/erp,tvtsoft/odoo8,bplancher/odoo,cdrooom/odoo,ygol/odoo,Elico-Corp/odoo_OCB,bplancher/odoo,ygol/odoo,deKupini/erp,syci/OCB,stephen144/odoo,odoousers2014/odoo,syci/OCB,alhashash/odoo,ygol/odoo,tvtsoft/odoo8,Elico-Corp/odoo_OCB,syci/OCB,laslabs/odoo,storm-computers/odoo,optima-ict/odoo,storm-computers/odoo,syci/OCB,Elico-Corp/odoo_OCB,optima-ict/odoo,odoousers2014/odoo,dfang/odoo,storm-computers/odoo,microcom/odoo,odoousers2014/odoo,optima-ict/odoo,deKupini/erp