bug 1031543 - allow importing user certificates via certificate manager r=honzab
Bug 1026485 - Fix sps bug relating to ArgumentCheck bailouts that cause OOMs. r=nbp
Bug 1018265 - iframe containing Javascript alert() dialog fails after leaving and returning to page, r=bz

--HG--
extra : rebase_source : eee7ae5e4f980e580004b9149a2b1973873e03d2
Bug 1036093 - ignore mach exceptions when printing binary paths; r=gps
Bug 1034321 - Officially don't try to print e10s tabs until that is supported - r=billm
Bug 1037626: Support Webrtc H.264 offers with only packetization mode 1 r=ehugg
Merge m-c to inbound. a=merge
Bug 1037151 - Purge EOL whitespace from some files. - r=mattwoodrow
Bug 1037147 - Purge EOL whitespace. - r=mattwoodrow
Bug 1017165 - Sort arenas in order of increasing free space during finalization. r=billm
Bug 1034910 - Make the dtor of nsJSArgArray protected. r=smaug
Bug 964511 - Delay Snippets.js initialization until after startup r=mfinkle

--HG--
extra : histedit_source : 4fba71c58717aad098c60bc767090741ef8f4883
Bug 984048 - Patch 6 - Scope ordering and utility functions. r=ehsan,khuey

Added r=khuey via IRC to validate webidl DOM peer check.

--HG--
extra : rebase_source : 0aa1a6bcdc0f2ec8c5cd8af44d39afb62b1d4abf
Bug 1031414 - Update LZ4. r=Ms2ger
Bug 1037324: Delegate additional name constraint selection to the TrustDomain in mozilla::pkix, r=cviecco

--HG--
extra : rebase_source : 300f33bfb3a0c9ae1525695b080674c1fb21eafc
Bug 982693 - use -fno-integrated-as (if available) with clang when building vp8_asm_enc_offsets.c r=tterriberry
Bug 1037151 - Merge SharedSurface_GL into SharedSurface. - r=mattwoodrow
Bug 1037147 - Purge EOL whitespace again. - r=mattwoodrow
Bug 1034682 - Remove nonsensical sandboxProto waiving in the wantXrays case. r=peterv

This doesn't make sense. wantXrays means that the WrapperFactory machinery gives
us Xrays in the same-origin case. When it's false, we don't have Xrays to
same-origin objects to begin with, so the waive is useless. Its only observable
effect comes in the situation of privileged (i.e. nsEP) sandboxes with a
less-privileged sandboxPrototype. And I see no reason why these things should get
a waived prototype.

It looks like this was added in 2010 for the Web Console in bug 611401. None of
that is applicable anymore.
Bug 1034682 - Move remaining wacky wantXrays behavior to the JS entry point so that we don't have to worry about it when creating Sandboxes from C++. r=peterv