Bug 958889 - Part 2.5: Add old Sync upgrade URL method to services and strings. r=nalexander
Bug 958889 - Part 2.6: Remove unused PanelView.getLayout code. r=nalexander
Bug 1008647 - fix left padding and remove separator for top show all bookmarks item, r=mak
Bug 997487 - Add awesomescreen session and cancel button UITelemetry. r=liuche f=mfinkle
Bug 797639 - Part -1: Change forwarding prefix to slash. r=jimb
Bug 797639 - Part 0: Clean up transport style. r=jimb
Bug 797639 - Part 1: Bulk data support in the transport layer. r=jimb

--HG--
rename : toolkit/devtools/moz.build => toolkit/devtools/transport/moz.build
rename : toolkit/devtools/moz.build => toolkit/devtools/transport/tests/moz.build
rename : toolkit/devtools/server/tests/unit/test_dbgsocket.js => toolkit/devtools/transport/tests/unit/test_dbgsocket.js
rename : toolkit/devtools/server/tests/unit/test_dbgsocket_connection_drop.js => toolkit/devtools/transport/tests/unit/test_dbgsocket_connection_drop.js
rename : toolkit/devtools/server/transport.js => toolkit/devtools/transport/transport.js
Bug 797639 - Part 2: Bulk data support in client and server. r=jimb
Bug 797639 - Part 3: Fix Marionette client / server loading and parsing. r=jgriffin
Bug 797639 - Part 4: Fix Network Monitor test leaks. r=vporof
Bug 993712 - Remove hand-rolled timeout handler from customizableui/test/head.js. r=test-only

I'm trying to smoke out an intermittent orange in bug 993712, and I'm starting to run dry on
ideas. I'm having no luck reproducing the bug locally. What I'm trying to do here is cause
the orange (when it rears its head) to force a mochitest timeout, which will take a screenshot.
I'm hoping that screenshot gives me some clues about what's going on.
Bug 1009853 - Override getNotificationUri() in TopSitesCursorWrapper (r=mfinkle)
Bug 1010445 - Fix instanceof checks in CastingApps. r=mfinkle
Bug 741047 - Implement opening in-content preferences to a given view. r=Gijs

--HG--
extra : rebase_source : cf486a6e5c8673d66a57e3b726b58073c694a338
Bug 738797 - Enable the in-content preferences by default. r=Unfocused

--HG--
extra : rebase_source : 4c06ec299a082f4a2c587fe5cbeff3b0e5b21548
Merge m-c to fx-team
Bug 1006943 - non-sensitive FxA log info is included with sync logs. r=rnewman
Bug 961471 - ensure the initial sync prefs pane writes the sync preferences. r=ttaubert
Backed out changeset 25fa9e0e5b06 (bug 738797)
Backed out changeset 49859608dbb8 (bug 741047) for bc1 memory leaks