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 947018: Unbreak testBrowserProvider. r=trivial
No bug, remove trailing whitespace on a CLOSED TREE
merge fx-team to mozilla-central a=merge