Bug 853650 - Support for multiple simultaneously running profiles. r=past
Bug 771466 - GCLI devtools.command.dir option should accept ~ for home directory; r=jwalker
Bug 850929 - GCLI needs a simpler way to mark parameters as being options; r=paul
Bug 852110 - Allow tools to build a concrete panel rather than only a promise of a panel; r=mratcliffe
Bug 657595 - GCLI type conversion should be a type->type affair not just arg->type; r=mratcliffe
Bug 722727 - GCLI should make the value available to max/min functions; r=mratcliffe
Bug 784790 - GCLI cookie command should use internal Cookie API rather than document.cookie; r=mratcliffe
merge m-c to fx-team
Bug 854212 - Fix link errors in jsfuninlines.h caused by bug 851421.  r=smaug.
Merge last PGO-green mozilla-inbound changeset to mozilla-central.
Merge mozilla-central to mozilla-inbound
Bug 853067 - Do not define the parallel array global in beta, release, or esr builds (yet) r=sfink
Bug 851611 - Part 1: Refactor profiler interface. r=jrmuizel

--HG--
extra : rebase_source : 4eac969fd5c1d40d96a2223104336709d62a3148
Bug 851611 - Part 2: Update profiler calls. r=jrmuizel

--HG--
extra : rebase_source : f76accc3d3dd86c75cb3e9750734f23ec9c29941
Bug 851611 - Part 3: Rename headers. r=jrmuizel

--HG--
rename : tools/profiler/sampler.h => tools/profiler/GeckoProfiler.h
rename : tools/profiler/sps_sampler.h => tools/profiler/GeckoProfilerImpl.h
extra : rebase_source : 6ea7c660764a4390cdd8dd91561fff1d7bad6035
Bug 851611 - Part 4: Split out GeckoProfilerFunc.h & PseudoStack.h. r=jrmuizel

--HG--
rename : tools/profiler/sps_sampler.h => tools/profiler/GeckoProfilerImpl.h
extra : rebase_source : 929cd0d6227dd12f6654b61077e63e4d86036dc0
Bug 852850 - Remove the faily test_image_layers.html mochitest. r=joe

--HG--
extra : rebase_source : c394b7f89327dd9e8f0f08f174d48cd18de93c85