[Merge] lp:~michael-sheldon/webbrowser-app/file-upload-mime-types into lp:webbrowser-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:549
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/845/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/556
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1165
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1165/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6777/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7983

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/845/rebuild

-- 
https://code.launchpad.net/~michael-sheldon/webbrowser-app/file-upload-mime-types/+merge/220685
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~michael-sheldon/webbrowser-app/file-upload-mime-types into lp:webbrowser-app.