Merge proposals dependent on lp:~openerp-community/openobject-doc/6.0

lp:~openerp-community/openobject-doc/6.0 has no merge proposals.