Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap

lp:~openerp-dev/openobject-addons/trunk-tipsy-to-boostrap has no merge proposals.