Bug 887394 - Don't collect state right after startup when restoring the initial session; r=yoric
Bug 883220 - Raise the toolbox window if breakpoint is hit, r=vporof
Bug 656273 - Create a toolbar for Scratchpad; r=dcamp
Bug 828038 - Change profile recording UI and behavior; r=dcamp
Bug 888120 - Add an image file for the profiler stopwatch button; r=me
Merge mozilla-central and fx-team
Bug 886137 - Can't inspect objects in the webconsole, while debugging and inspecting; r=past
Bug 886036 - Port pseudoclass lock to the inspector actor. r=harth

--HG--
extra : rebase_source : c515e1a85da5d484686e1ae8b55c4dbfd90f214f
Bug 798914 (part 6) - Followup: move MemoryReporting.h include after the cpp's own header include.  r=njn.
Bug 877248 - Use a TextureView and setAlpha to make preview invisible. r=blassey
Bug 874569 - Adjust rotation amount if the Android device is rotated. r=blassey
Bug 713933: Make false start work with asynchronous certificate verification, r=bsmith

--HG--
extra : rebase_source : b895a399e381996f7e55d06f94a684469e287b8d
bug 658222 - Enable TLS False Start (PSM) r=bsmith

--HG--
extra : rebase_source : ac9f77ba73a0a902f4b6aa8d52add7d52efb1b53
Bug 888132 - MOZ_GOOGLE_API_KEY_FILE should be an include file. r=khuey
Bug 498181 - Offer to reset a user's profile if it was last used more than two months ago. r=jaws

--HG--
rename : toolkit/content/resetProfile.js => toolkit/modules/ResetProfile.jsm
extra : rebase_source : 88969c77e4d86ba2d6cecbe188e19ad390f6629d
Bug 888570 - Lazily load ForgetAboutSite.jsm from browser/components/places/content/controller.js. r=jaws

--HG--
rename : toolkit/content/resetProfile.js => toolkit/modules/ResetProfile.jsm
extra : rebase_source : 840e79ad4b087999f08ffbdbf152418ecb9182ea
Bug 883024 - Install missing stylesheets for b2g. r=roc
Bug 865745 - Stop depending on mCx during frame script execution. r=smaug
Bug 865745 - Rename nsFrameScriptExecutor::DidCreateCx. r=smaug
Bug 865745 - Hold a strong ref to the global for the duration that each nsFrameScriptCx is on the stack. r=smaug

These things currently do a complicated refcounting dance to avoid destroying the
cx until all the consumers of it are gone. That stuff can mostly go away now that
we're just using the SafeJSContext, but DestroyCx also nulls out the global, so
we should make sure to keep that alive for anyone that might be using it.