Bug 961867: Pass app tab status to child processes and allow onBeforeLinkTraversal to work there. r=smaug, r=felipe
Bug 1061947 - Avoid flushing layout and making it dirty repeatedly in ToolbarIconColor.inferFromText. r=gijs
Bug 1060678 - Notify Gecko when browser history is cleared from HistoryPanel. r=margaret
Bug 1060496 - Make search activity locale-aware. r=margaret
Bug 1048618: Send nsIURIFixupInfo to the parent process. r=gijs
Bug 1055144 - Implement sendRequestForResult. r=wesj
sendRequestForResult is a promise-based API for messaging Java. It
replaces the callback version of sendMessageToJava.
Bug 1055144 - Change callback-based sendMessageToJava calls to Messaging.sendRequestForResult. r=wesj
Bug 1060944 - fix up help icon on Yosemite, r=ttaubert

--HG--
extra : rebase_source : a934907fdb2b0b29572c2a795c1cecf7af34d87f
Bug 1060464 - fix the --jsdebugger flag when running tests, also fixes bug 1060493, r=dcamp,bsmedberg
Backed out changeset c1319f301eb0 (bug 1060464) for devtools bustage
Bug 1055139 - Retrieve Simple Push Server URL from Loop Server r=mhammond,Standard8
Merge m-c to fx-team a=merge
Bug 1058164 - Test that we get pageshow and pagehide events in content scripts when swapping frameloaders. r=smaug.

--HG--
extra : rebase_source : 41e6bf3145fd32358b736485b6b56bdced6d1e01
extra : histedit_source : fd7e7f0ba12393755d0111dee9fd1f9377f09623%2C0adc2c95bf5d1af2b413e9d69be6b73c986e8efd
Bug 1058164 - pageshow and pagehide events with the persisted property are not dispatched to content scripts when swapping frame loaders. r=smaug,felipe.

Frame scripts were not getting pageshow and pagehide events with the persisted
property during frameloader swapping due to the fact that the event target for
those events was set to be the chrome event handler. This patch makes the
event target be the nsInProcessTabChildGlobal instead, so frame scripts see
the events. This still needs to be fixed for the e10s case, but that will
have to wait until bug 918634 is fixed.

--HG--
extra : source : 738461f289977e9b7e975831a4755cda6f6ab49e
extra : histedit_source : 8255ca9aa900adf1216de8cf9f4ceec8e5c2a71c%2Cd20e41b1200bac5dab5bbdad8cc22293ec92dbea
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (BrowserApp.java) r=rnewman
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (HomePanels) r=rnewman
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (SuggestedSites.java) r=rnewman
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (Distributions.java) r=rnewman
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (BrowserLocaleManager.java) r=rnewman
Bug 1061430 - Change SharedPreferences.Editor commit() to apply() where appropriate (Preference Helpers) r=rnewman