Bug 904022 - [email/IMAP] blacklist broken SPECIAL-USE implementations
Merge pull request #234 from asutherland/blacklist-imap-caps

Bug 904022 - [email/IMAP] blacklist broken SPECIAL-USE implementations
Bug 893579 - [Email] Trim whitespaces in contact name
Bug 902070 - [email/activesync] Change jswbxml to run its unit tests under mocha. r=squib

upgrade jsas to take updated jswbxml; source pull requests are:
https://github.com/mozilla-b2g/jsas/pull/13
https://github.com/mozilla-b2g/jswbxml/pull/5
Merge pull request #236 from asutherland/update-wbxml-mocha

Bug 902070 - [email/activesync] Change jswbxml to run its unit tests under mocha. r=squib
Merge pull request #235 from mcirlanaru/master

Bug 893579 - [Email] Trim whitespaces in contact name. r=asuth
Bug 874348 - [Buri][Email]Failed to send and receive mail with 163 exchange account. r=asuth

take jimporter's jsas changes from:
https://github.com/mozilla-b2g/jsas/pull/12

which landed in jsas/worker-thread:
https://github.com/mozilla-b2g/jsas/commit/b953c81b8dad7be4a4cc7a228e69fcef3df5a107
Merge pull request #237 from asutherland/163-activesync

Bug 874348 - [Buri][Email]Failed to send and receive mail with 163 exchange account. r=asuth
Bug 899070 - wrapTextIntoSafeHTMLString should really return a safe html string r=asuth
Merge pull request #233 from mcav/bug-899070-html-escaping

Bug 899070 - wrapTextIntoSafeHTMLString should really return a safe html string. r=asuth