Bug 1100632 - Remove --disable-opus option and MOZ_OPUS #define macros. r=rillian,ted
Bug 1105851 - Unbreak non-unified non-SPS build after 1054498. r=jcj
Bug 1105104 - Fix the painting of XUL tree connector lines. r=Bas
Bug 1104433 part 1 - Update test_error_events.html to set allow_uncaught_exception; r=Ms2ger
Bug 1104433 part 2 - Update dom/imptests/testharness.js and friends; rs=Ms2ger
Bug 1104433 part 3 - Extend the timeout of dom/imptests/editing/conformancetest/test_runtest.html; rs=Ms2ger
Bug 1048745 - [WebGL2] Integer vertex attributes. r=jgilbert

--HG--
extra : rebase_source : 590eaef6f7582701607e48f7e67bbe7100ff7199
Bug 1106474 - Drop conversationStore's use of Backbone.Model for Loop. r=nperriault
Bug 1100378 - Retry button for Hello standalone. r=nperriault
Bug 1106934 Opening a Loop room can show an unexpected error due to race conditions. r=nperriault
Merge mozilla-central to fx-team
Bug 1102441 - Clean up the BreakpointStore;r=jimb
Backed out changeset 49218eb557ad (bug 1102441) for XPC Shell Test failures on a CLOSED TREE

--HG--
extra : amend_source : c64c1e23019f599454321f98899d8e99883d7564
Bug 1080212 - [e10s] Add Telemetry probe for js exceptions that occur in the addon js compartment.r=billm
Bug 1102441 - Clean up the BreakpointStore;r=jimb
Bug 947018: Delete large amounts of database migration code. r=wesj
Bug 1072808 - Part 1: Add TelephonyMessenger as a Wrapper for TelephonyService-Related System Messages. r=echen
Bug 1072808 - Part 2: Add SmsMessenger as a Wrapper for Sms-Related System Messages. r=echen
Bug 1072808 - Part 3: Add CellBroadcastMessenger as a Wrapper for CellBroadcast System Messages. r=echen
Bug 1072808 - Part 4: Add MobileConnectionMessenger as a Wrapper for USSD/CdmaInfo System Messages. r=echen