[MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c
Merge branch 'master' of bzr::lp:openerp-web