Bug 925584 - Remove some unnecessary jsapi.h inclusions from .cpp files.  r=Ms2ger.

--HG--
extra : rebase_source : 41fcb0e922a519ef679c1c1b6293c2b638e83a48
Merge m-c to m-i
Bug 912015 - Support multiple wap_supplicant connections. r=mrbkap
Bug 930916 - Add a function for getting the PaintedSurface as a data URI. r=gbrown
Bug 930588 - Dark/Light theme follow-up updates for CodeMirror
Bug 922981 - Split marDownload.js into individual tests. r=bbondy

--HG--
rename : toolkit/mozapps/update/tests/unit_aus_update/downloadMar.js => toolkit/mozapps/update/tests/unit_aus_update/downloadAndHashCheckMar.js
rename : toolkit/mozapps/update/tests/unit_aus_update/downloadMar.js => toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js
Merge mozilla-central and fx-team
Bug 924480 - Part 1: Make search_container focusable before browser_toolbar. r=bnicholson
Bug 924480 - Part 1.5: Make HomePager focusable. r=lucasr
Bug 924480 - Part 2: Disable TalkBack access to Gecko with HomePager displayed. r=eeejay,lucasr
Bug 915918 - Part 1: Select previously selected tab upon editing mode exit. r=lucasr
Bug 915918 - Part 1.5: Refactor hiding of BrowserSearch and HomePager into onStopEditing. r=lucasr
Bug 915918 - Part 2: openUrl -> openUrlAndExitEditingMode. r=lucasr
Backed out changeset c9bdbfd50135 (bug 915918)
Backed out changeset d93a9e884f13 (bug 915918)
Backed out changeset 906461e491d9 (bug 915918)
Backed out changeset 29fb758db402 (bug 924480)
Backed out changeset 1c70214e37d0 (bug 924480)
Backed out changeset 36eded3813d6 (bug 924480)
Bug 931876 - Rev UUID for SessionStore.idl. r=mfinkle

--HG--
extra : rebase_source : 1d6bdc60c6a6769a0518ac195807f71c699c8e06