bug 970291 - Remove BookmarkJSONUtils.serializeNodeAsJSONToOutputStream. r=mano
bug 959573 - Land UnifiedAutocomplete (disabled by default). rs=ttaubert
Backed out changeset e2aff2cd9a9a (bug 959573) for bc1 test failures on a CLOSED TREE
Bug 995170 - Convert legacy uses of promise.js in devtools where this doesn't result in test failures. r=jwalker
Merge m-c to fx-team
Bug 995972 - Make mochitest-devtools mach command work with single folders or files r=jmaher
Bug 988102 - Opening inspector scrolls the content page all the way to the top;r=bgrins
Bug 974171 - Add DEVTOOLS_TOOLBOX_* flags r=jwalker
Backed out changeset a3337bda5a22 (bug 995972) for mozbuild test failures.
CLOSED TREE
Backed out changeset e6b103b4369e (bug 974171) for mochitest-dt failures.
CLOSED TREE
Bug 987792 - increase panel buttons' labels' clip rect height, r=jaws
Merge fx-team to m-c.