Bug 852477 - [email] Use MimeMapper to determine the downloadable attachments
Bug 860896 - Land a temporary mocha hack to work around a build problem (see Bug 855049), r=lightsofapollo, a=test-only
Merge branch 'master' of github.com:jonallengriffin/gaia into mochahack