Bug 735600 - Don't composite when the layer tree is empty. r=bgirard
Bug 725095 - Merge off-main-thread compositor from Maple. IGNORE BAD COMMIT MESSAGES
Bug 735763 - Turn off FPS by default. r=kats
Bug 735713 - Make sure that we can update users if the version of the application has been bumped up; r=rstrong
Bug 730587: Stash a pointer to the subtree root on DOM nodes. r=smaug, sr=jst
Bug 732982 - Expose a wifi API to the DOM. The API is very much a work in progress and will change soon. r=cjones/fabrice/vigntetun DONTBUILD

--HG--
extra : rebase_source : c44979e32dfffc46502f21c59c691a13e0319cad
Bug 735517. Web Apps icon always appears when other popup notifications appear. r=fabrice,dao
Backed out changeset a888f210af4e (bug 735713) because of test failures on Windows

--HG--
extra : rebase_source : eb2c30597bd72049b57e3aed4a496e007d322d03
Bug 735713 - Make sure that we can update users if the version of the application has been bumped up; r=rstrong
Back out bug 735313, an invariant was relaxed but not all assertions of it were adjusted properly, and I'm not 100% confident tinderboxen will correctly handle the new failure mode.  r=bustage
Bug 735874 - (1/2) Refactor add-on manager enable/disable functions [r=mfinkle]
Bug 735874 - (2/2) Show/hide the options when an add-on is enabled/disabled [r=mfinkle]
Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 1: Change dom/system/b2g to dom/system/gonk; r=philikon

--HG--
rename : dom/system/b2g/AudioManager.cpp => dom/system/gonk/AudioManager.cpp
rename : dom/system/b2g/AudioManager.h => dom/system/gonk/AudioManager.h
rename : dom/system/b2g/GonkGPSGeolocationProvider.cpp => dom/system/gonk/GonkGPSGeolocationProvider.cpp
rename : dom/system/b2g/GonkGPSGeolocationProvider.h => dom/system/gonk/GonkGPSGeolocationProvider.h
rename : dom/system/b2g/Makefile.in => dom/system/gonk/Makefile.in
rename : dom/system/b2g/RadioInterfaceLayer.js => dom/system/gonk/RadioInterfaceLayer.js
rename : dom/system/b2g/RadioInterfaceLayer.manifest => dom/system/gonk/RadioInterfaceLayer.manifest
rename : dom/system/b2g/SystemWorkerManager.cpp => dom/system/gonk/SystemWorkerManager.cpp
rename : dom/system/b2g/SystemWorkerManager.h => dom/system/gonk/SystemWorkerManager.h
rename : dom/system/b2g/net_worker.js => dom/system/gonk/net_worker.js
rename : dom/system/b2g/nsIAudioManager.idl => dom/system/gonk/nsIAudioManager.idl
rename : dom/system/b2g/nsIRadioInterfaceLayer.idl => dom/system/gonk/nsIRadioInterfaceLayer.idl
rename : dom/system/b2g/nsIWorkerHolder.idl => dom/system/gonk/nsIWorkerHolder.idl
rename : dom/system/b2g/nsRadioInterfaceLayer.h => dom/system/gonk/nsRadioInterfaceLayer.h
rename : dom/system/b2g/ril_consts.js => dom/system/gonk/ril_consts.js
rename : dom/system/b2g/ril_worker.js => dom/system/gonk/ril_worker.js
rename : dom/system/b2g/systemlibs.js => dom/system/gonk/systemlibs.js
rename : dom/system/b2g/tests/header_helpers.js => dom/system/gonk/tests/header_helpers.js
rename : dom/system/b2g/tests/test_ril_worker_buf.js => dom/system/gonk/tests/test_ril_worker_buf.js
rename : dom/system/b2g/tests/test_ril_worker_sms.js => dom/system/gonk/tests/test_ril_worker_sms.js
rename : dom/system/b2g/tests/xpcshell.ini => dom/system/gonk/tests/xpcshell.ini
Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 2: Change mozilla::dom::telephony to mozilla::dom::gonk for dom/system/gonk objects; r=bent
Bug 730955 - Make Telemetry opt-in notification consistent with other Telemetry messaging, r=gavin
Bug 735877 - Update syntax hints in pref files to reflect the fact that you can't use computed values (e.g. 50 * 1024). r=mossop
Backout 11a5cc8bb70a (bug 723251) due to bustage.
Backout changeset 6151695f9df4 (bug 715744) because we decided that the blocklist is not a good idea
Bug 664342 - Delete border between upper and lower sections, and change background color of lower area. r=dao
Bug 735233 - Shift-F6 should focus the location bar rather than the first focusable chrome element. r=enn