Bug 880670 - [email/activesync] some ActiveSync implementations blacklist Mozilla in the user-agent string and return a 440 status code
Merge pull request #311 from jimporter/as-user-agent

Bug 880670 - [email/activesync] some ActiveSync implementations blacklis...
Bug 851963 - Fixed issue where ios shared images would not appear as attachments
Bug 1024660 - persistent failure in test_mutation for pop3:fake

At some point something changed in b2g's execution (ex: this did not used
to fail, but when I upgraded my b2g it now consistently fails) so that ugly
leftover state in _TEST_pendingHeaderDeletes from a test step that was not
relevant to POP3 was failing due to a refusal to structured clone the state.

I'm not sure exactly what the change was and I assert we really don't need
to care since we don't want to be persisting the state in question anyways.

Note that bug 921050 will moot the structured clone problem as described in
the comment in the patch.
Merge pull request #312 from asutherland/fix-pop3-test-mutation

Bug 1024660 - persistent failure in test_mutation for pop3:fake. r=mcav
Merge pull request #309 from awiss/ios-images

Bug 851963 - [email] iOS mail client attached images may be treated as embedded images that cannot be viewed because there is no referencing text/html part. r=asuth
[Bug 825538] [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync.
Merge pull request #313 from asutherland/as-unique-device-id

[Bug 825538] [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Bug 1025711 - [email/sanitizer] Quiet bleach.js CSS parser errors. r=jrburke

land https://github.com/mozilla-b2g/bleach.js/pull/8
Merge pull request #314 from asutherland/quiet-css-errors

Bug 1025711 - [email/sanitizer] Quiet bleach.js CSS parser errors. r=jrburke