Bug 1032559 - Fix for mochitest-chrome slow download mar tests fail when the app.update.download.backgroundInterval pref is 0. r=spohl
Bug 1033000 - Fix Yahoo search codes r=rnewman
bug 1033013 - disable testMasterPassword r=mfinkle
bug 1025931 - Crash java.lang.NullPointerException in in org.mozilla.gecko.GeckoAppShell.getContext r=snorp
bug 1030738 - NullPointerException when getting action bar r=rnewman
bug 1030743 - NullPointerExceptions in GeckoPreferences r=rnewman
Bug 693555 - Update inline spell checker underlining for multiprocess.r=ehsan,mrbkap
Backed out changeset d87da7f7a3a9 (bug 693555) for android and b2g build bustage
Merge m-c to fx-team a=merge
Bug 946656 - Increase toolbar title text change timeout. r=margaret
Bug 974652 - "Add aWidgetId and aArea to INFO()'d message when failing in onWidgetRemoved". r=MattN
Bug 978964 - Display combined bitmask values in the canvas debugger. r=vp
Bug 1026392 - Avoid unhandled promise chain rejections in browser_ruleview_add-property-cancel_02.js. r=jwalker
Bug 1031351 - Don't prettify CSS source if it has more than one line per rule. r=jwalker
Bug 1032482 - Only render redundant connections between nodes once in the web audio editor. r=vp
Bug 1032801 - Avoid unhandled promise chain rejection in browser_inspector_pseudoClass_menu.js. r=jwalker
Bug 1030277 - new content provider for search history. r=rnewman
Bug 1031308 - Type error in `SyntaxTreesPool.prototype_call` in Parser.jsm. r=past
Bug 1032646 - Record discovery replies to avoid purging every time. r=paul
merge fx-team to mozilla-central a=merge

--HG--
extra : amend_source : 6b1927dd9d7d8eedfc694b66e8aceb7c3fc24935