Merge proposals dependent on lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1

lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1 has no merge proposals.