[FIX] website's translation problems on multiple inheritance
Merge branch 'master' of bzr::lp:openobject-server