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 1093688 - [PP] ALA bug - Exception not working. r=mt
Bug 1100345 - Make Mulet appear as B2G for Marionette r=jgriffin

When running Gaia Marionette integration tests, we need to talk to Mulet
like if it was a B2G device. We define the "b2g.is_mulet" pref for this
purpose.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e0e95c183727
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #26601 from chirarobert/bug_1107005

Bug 1107005 - [v2.2] Disable test_call_log_all_calls.py due to Bug 10963...

========

https://hg.mozilla.org/integration/gaia-central/rev/dd84acd3369f
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1107005 - [v2.2] Disable test_call_log_all_calls.py due to Bug 1096385
Bumping manifests a=b2g-bump
Backed out changeset 168da3cbb27b (bug 1093688) for failing gip tests
Merge mozilla-central to b2g-inbound
Bug 1048676 - Part 1: WebIDL and DOM change. r=smaug, dimi

From 28e46b34f04d20d5f10c14a85e77ec1ac98aad9e Mon Sep 17 00:00:00 2001
---
 dom/apps/PermissionsTable.jsm     | 9 +++++++--
 dom/nfc/nsNfc.js                  | 9 +++++----
 dom/webidl/MozNFC.webidl          | 8 ++------
 dom/webidl/MozNFCPeer.webidl      | 2 +-
 dom/webidl/MozNFCPeerEvent.webidl | 2 +-
 dom/webidl/MozNFCTagEvent.webidl  | 2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)
Bug 1048676 - Part 2: Nfc.js and test case change. r=dimi

From 609631024dbcf07d74c13b15ce201b499e6176dd Mon Sep 17 00:00:00 2001
---
 dom/nfc/gonk/Nfc.js                                | 30 +++++++++++-----------
 .../marionette/test_nfc_checkP2PRegistration.js    |  4 +--
 .../tests/marionette/test_nfc_error_messages.js    |  4 +--
 dom/nfc/tests/marionette/test_nfc_peer.js          |  4 ++-
 4 files changed, 22 insertions(+), 20 deletions(-)
Bug 1105126 - Change test_eme_stream_capture_blocked.html to check loadeddata instead of canplay. r=cpearce
Merge mozilla-central to mozilla-inbound
Bug 1102632 - Stop triggering non-secure fallback for SSL_ERROR_UNSUPPORTED_VERSION. r=keeler