Bug 684096 - "The webconsole should display column numbers in addition to line numbers". c=mdibaiee
Bug 1093718 - Turn off minification of Fennec JS in Nightly. r=mfinkle

In b2g/installer/Makefile.in, minification is conditional on not being a
debug build.  Seems reasonable to have minified and non-minified builds
regardless of release channel, so I've copied that here.
Bug 1094429 - fix strict warning in sanitize.js, r=gavin

--HG--
extra : rebase_source : 4e970dad314c815f535fa388c0d8ab77356ea6ff
Bug 1080801 - Adjust comments for failing tests in e10s-mode, rs=comments-only
Bug 985597 - Use the AnonymousContent Document API for the highlighters; r=miker r=Gijs

--HG--
rename : browser/themes/shared/devtools/highlighter.inc.css => browser/themes/shared/devtools/highlighter.css
Bug 985597 - Filter useless highlighter updates & and use requestAnimationFrame for updates; r=miker
Bug 985597 - Tests for the new highlighter implementation using the AnonymousContent API; r=miker r=jwalker

--HG--
rename : browser/devtools/markupview/test/browser_markupview_highlight_hover_01.js => browser/devtools/inspector/test/browser_inspector_highlighter-hover_01.js
rename : browser/devtools/markupview/test/browser_markupview_highlight_hover_02.js => browser/devtools/inspector/test/browser_inspector_highlighter-hover_02.js
rename : browser/devtools/markupview/test/browser_markupview_highlight_hover_03.js => browser/devtools/inspector/test/browser_inspector_highlighter-hover_03.js
rename : browser/devtools/inspector/test/browser_inspector_highlight_after_transition.html => browser/devtools/inspector/test/doc_inspector_highlight_after_transition.html
rename : browser/devtools/inspector/test/browser_inspector_infobar_01.html => browser/devtools/inspector/test/doc_inspector_infobar_01.html
rename : browser/devtools/inspector/test/browser_inspector_infobar_02.html => browser/devtools/inspector/test/doc_inspector_infobar_02.html
Bug 985597 - Don't highlight hidden nodes; r=miker
Bug 985597 - Fix layout-view tests after highlighter changes & make them more robust; r=miker

--HG--
rename : browser/devtools/layoutview/test/browser_editablemodel.js => browser/devtools/layoutview/test/browser_layoutview_editablemodel.js
rename : browser/devtools/layoutview/test/browser_editablemodel_allproperties.js => browser/devtools/layoutview/test/browser_layoutview_editablemodel_allproperties.js
rename : browser/devtools/layoutview/test/browser_editablemodel_border.js => browser/devtools/layoutview/test/browser_layoutview_editablemodel_border.js
rename : browser/devtools/layoutview/test/browser_editablemodel_stylerules.js => browser/devtools/layoutview/test/browser_layoutview_editablemodel_stylerules.js
Merge mozilla-central to fx-team
Bug 1093507 - Fix for permaorange, with comments addressed;r=gijskruitbosch
Bug 1094248 - Process remaining Promise microtasks before blocking inside a nested event loop in the main thread. r=bz
Bug 1063753 - Remove Remote Tabs tray from Fennec entirely. r=mcomella

This mops up the bits of the Remote Tabs tray not already deleted by Bug
1014994.
Bug 1065201: introduce new sounds for Hello standalone and desktop. r=mikedeboer
Bug 1089771 - Change conditional statements to fix --chunk-by-dir on Android. r=jmaher
CLOSED TREE
Merge m-c to fx-team. a=merge
CLOSED TREE
Bug 1074688 - Part 2 Add Join/Refresh/Leave room functions to the mozLoop API. r=mikedeboer
Bug 1074688 - Part 3 Hook the new activeRoomStore into the standalone views, and also extend the store to manage joining rooms on the Loop server. r=nperriault,a=RyanVM
Backout revision 224f20dce9d0 (bug 1078539)
Bug 1078539 - Add a doorhanger widget for the developer edition notification to browser console, developer tools, webide and responsive design mode. r=jryans