Bug 624883 - Add parentheses around protocol list in dom unknownProtocolFound string. r=bz
Bug 927969 - Disable extensions when the WebGL context is lost. r=bjacob
Bug 962140 NativeKey should not check scan code at comparing found char message and removed char message r=jimm
Backed out changeset 94e20568f4e8 (bug 791480) because the patch that led to the new annotation was backed out.
Merge mozilla-central to mozilla-inbound
Bug 973405 - Move some misc LOCAL_INCLUDES to moz.build; r=glandium
Bug 973658 - Actually revert the value of the Permanent Private Browsing pref when the user presses Cancel in response to the restart dialog; r=jdm

Before we were implicitly relying on the pref being reverted through
the checkbox, but that won't happen if the checkbox was never clicked
by the user.
Bug 970123 follow-up: convert the tabs injected into the file into spaces, DONTBUILD
Bug 874806 - GStreamerReader::PlayBinSourceSetupCb() doesn't need to do a bogus read anymore. r=cpearce
Bug 907373 - Fix -moz-os-version media query on Windows 8.1. r=jimm
Bug 949907 - GetUserMediaDevices cleanup + untie GetUserMediaRequest obj from DOM. r=jesup
Bug 966881 - ARM Simulator: Add support for the ARM hardfp ABI. r=mjrosenb
Bug 968432 - Implement mozilla::ipc::SetThisProcessName() on BSDs. r=dhylands
Bug 968798 - Don't let CPPFLAGS use system ICU headers when building internal ICU. r=glandium
Bug 972843 - Make Image::GetAsSourceSurface pure virtual. r=nical
Bug 973296 - Pull JitCommon.h explicitly for CALL_GENERATED_CODE. r=jandem
Bug 973388 - Move the LOCAL_INCLUDES in xpcom to moz.build; r=glandium
Bug 949600 - Sync mozbase to m-c one last time, r=wlach
Backed out changeset 0f7f99d0a2f5 (bug 968432) for bustage.
Bug 966881 - Fix style checker orange.