Bug 943629 - Remove unnecessary comment in Tabs. r=mcomella
Bug 975436 - Catch ClassCastException in ANRReporter. r=blassey
Bug 978447 - fix Australis' bookmarks menu hover and active style some more, r=bwinton
Bug 979864 - [markup view] After selecting a node using the picker button, the hover background is used until hovering the markup view;r=pbrosset
Bug 979587 - attempt to fix sidebar opening from Australis bookmarks menu, r=mconley

--HG--
extra : rebase_source : 8d0d3ca939b8f7327da50b5cf52327e3a37d19fa
Bug 979067 - Stop exporting the guard object classes; r=froydnj
Bug 977339 - Do GECKO_SEPARATE_NSPR_LOGS=1 by default, r=jduell
Backout the previous landing (15229e2a01b1) for Bug 978862, since it had wrong bug number, r=backout
Bug 978862, make sure to use the right event type atom throughout CompileEventHandlerInternal, r=jst
Bug 978646.  Properly cycle-collect document.styleSheetSets.  r=smaug
Bug 978618.  Fix error reporting for unintended XPConnect exceptions thrown by JS-implemented webidl to actually work correctly.  r=bholley
Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey
Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey

This agrees with Fennec (and BrowserInstrumentationTests).
Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey

This builds a new Java JAR containing only org.mozilla.gecko.R.  This
new JAR file is included in Fennec, but not included in
geckoview_library.  (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project.  This mimics that.)

Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
bug 896223 - Remove the version 1 manifest from the mar creation scripts. r=nthomas
Bug 900251 - Add support for add-if-not instruction added by bug 759469 to the mar generation scripts. r=nthomas
Bug 896224 - Remove support for the version 1 manifest from the updater. r=bbondy
Main patch for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy
Updated test binaries for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy

--HG--
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_before.exe => toolkit/mozapps/update/tests/data/complete.exe
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_after.exe => toolkit/mozapps/update/tests/data/partial.exe
Test cleanup and tests for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy

--HG--
rename : toolkit/mozapps/update/tests/unit_base_updater/marDirLockedStageFailure_win.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyDirLockedStageFailure_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marDirLockedStageFailureSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyDirLockedStageFailureSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailurePartialSvc_win.js