Bug 836470 - Clean up JS module imports that use a temporary scope object. r=gavin
Bug 834150: Just Say No to the fallback SW decoder. r=doublec a=blocking-b2g
Backed out changeset 25ea9ac37380 (bug 828176) for crashes.
Backed out changeset bd0fc79d7a8b (bug 835548), changeset b8d1949eeb05 (bug 834999), changeset 3d90fdbf38a4 (bug 835596), and changeset ba7ffb02dc3f (bug 834371) for mochitest-4 failures on a CLOSED TREE.
Bug 836369 - Intermittent test_history_tracker.js | test failed | true == false. r=trivial,test-only
Bug 836531 - Change getBuildConfiguration to output more information. r=sfink
Bug 836157 - Contacts API: Remove unused indexes. r=bent
Bug 835210 - FOTA updates don't seem to be working any more. r=fabrice
bug 822745 spdy settings type 5 cwnd support r=honzab
Bug 778085 followup - fix typo in help message. DONTBUILD
Bug 836513 - Support multiple object stores in IndexedDBHelper.jsm. r=gwagner
Bug 830855 - Remove JSScript::principals (sort of) (r=luke)

--HG--
extra : rebase_source : 584a12fbae35888d7c6f66dc0e0d403af7cc0fe0
Bug 818670: Enable AEC in PeerConnection, AGC/NoiseSuppression in gUM (w/bustage fix) r=derf
Bug 818670: merge AudioConduits to allow AEC to work r=ekr
Bug 818670: Ensure PipelineListener doesn't release conduit off main thread r=derf
Bug 836050 part 1.  Make Element::GetAttr non-virtual.  r=smaug
Bug 836050 part 2.  Make Element::HasAttr non-virtual.  r=smaug
Bug 836050 part 3.  Make Element::AttrValueIs non-virtual.  r=smaug
Bug 836050 followup.  Rev the nsIContent and Element IIDs.  r=smaug
Bug 801097 - Reader mode title shows HTML character encodings, r=bnicholson