Bug 1066483 - Drop SVG camelCase mappings filterRes, contentStyleType, contentScriptType and externalResourcesRequired. r=wchen.
Bug 1068123 - Make the MOZ_GCTIMER logs more verbose and readable; r=jonco

--HG--
extra : rebase_source : 010b83f2302c2b10e7ef3d3bb347a9b7b57a51b4
Bug 1067505 - Make nsCategoryManager into a strong memory reporter. r=njn

The nsCategoryManager singleton lives until very late in shutdown, so the unregister always fails.

It is okay to make it a strong reporter because it will always outlive the memory reporter manager anyways.
Backed out changeset a53aa43ab5f4 for Windows build bustage on a CLOSED TREE

--HG--
extra : rebase_source : d3a1aecd8882bc591898684c0a97f8929b7809a9
Bug 997908 - Test patch to make crash stacks better. r=mccr8
Backed out changeset 230ec8030aa7 (bug 1066483) for webplatform test failures.
Bug 1063053 - Add stronger types to WebGL texture code for better debug/compile time checking. r=jgilbert,kamidphish
Back out bug 1067505 for some kind of make package failure.
Backed out changeset 317c684efd2d (bug 997908) for mochitest-e10s leaks.
Backed out changeset 944bd4284ace (bug 1063053) for B2G bustage.
Merge m-c to inbound.
Bug 1063318: Switch Chromium IPC code to Mozilla's ref/auto ptr types. Also fix thread safety bug. r=nfroyd
Bug 1063053 - Add stronger types to WebGL texture code for better debug/compile time checking. r=jgilbert,kamidphish
Bug 1057563 - There is no need to sync with the GC helper thread between slices; r=jonco

--HG--
extra : rebase_source : b4cfe084e1b8fabcc95aa78b560ad2e1eaa3e5d4
Bug 967977 - Add pref to disable session identifiers (session tickets and session IDs). r=dkeeler
Bug 1064433 - Remove old unused webgl conformance mochitest files. - r=kamidphish
Bug 1065130 - nsFtpState::mDoomCache is used uninitialised r=jduell
Merge inbound to m-c a=merge