[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:545
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/826/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/494/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/833/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/826/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.