Bug 913446 - WebRTC Mochitest changes to allow running under Steeplechase. r=jsmith,ctalbert
Bug 900669 - convert some more ARM-only void* uses into ImmPtr (r=mjrosenb)

--HG--
extra : rebase_source : 8aa8548cece906325de356656e37af5812057c8d
Bug 900669 - OdinMonkey: avoid all uses of ImmPtr/AbsoluteAddress from asm.js code (r=bbouvier,mjrosenb,sr=jandem)
bug 904170 - telemetry for daily http data consumption r=jduell
Bug 918923 - Part 1: Fix the include-what-you-use pragmas in the string headers; r=bsmedberg
Bug 918923 - Part 2: Switch to #including nsString.h in code using the internal strings API; r=bsmedberg
Bug 918927 - Minimize the #includes in chrome/; r=bsmedberg
Bug 919054 - Use Audio node instead of audio API. r=marcoz
Bug 918598 - Support touch typing. r=marcoz r=davidb
Bug 919341 - Minimize the #includes in xpcom/ IDL files; r=bsmedberg
Bug 919403 - Fix warning about DocAccessible ctor's initialization order. r=tbsaunde
Bug 790483 - click-to-play plugins fail to show placeholder after resizing. r=jaws
Bug 903386 - Make all delayed PluginModuleParent tasks revocable. r=aklotz
Backed out changeset 8677a18553e7 (bug 790483) for m-oth failure on a CLOSED TREE
Merge m-c to inbound.

--HG--
rename : widget/gtk2/nsGtkIMModule.cpp => widget/gtk/nsGtkIMModule.cpp
Bug 919717, in preparation for WebIDL EventListener, fix nsWrappedJS' JSObject handling, r=mccr8

--HG--
extra : rebase_source : 0ff6855c2283b6b395e5ad1cfcdd813b7467ac43
Bug 919564 - fix sigaction symbol in shell/js-gdb.gdb (r=bbouvier DONTBUILD)
Bug 915735 - Part 1: Work around a bug in the MSVC PGO instrumented builds which prevents xpcshell to run successfully as a host tool during builds; r=sfink

--HG--
extra : rebase_source : e9b3bfc9cae14d0a699f584ccbda80157b065bc0
Bug 919505 - Minimize the #includes in dom/ipc; r=jst
Bug 879475: Allocing an actor for a bridged or opened protocol should return bool r=jlebar

Conflicts:
	dom/ipc/ContentChild.cpp
	dom/ipc/ContentChild.h