Bug 1040931 - Add extensionID parameter to addEngineWithDetails r=gavin
Bug 1032129 - Render AudioParam connections in web audio editor. r=vp
Backed out changeset 836c52cc3c05 (bug 1040931)
Merge mozilla-central and fx-team
Bug 1024686 - Add missing return in Sqlite.jsm. r=mak
Bug 1034368 - Add storage capabilities to GMPs. r=jesup
Bug 1055408 - Kill GMP timers when entering shutdown. r=jesup
Bug 1036186 - Reset Migration wizard no longer skips the first step to choose a browser. r=smaug.

--HG--
extra : rebase_source : 5fd0eed62b999eabf4a7a46300f4d74a6888b1f8
Bug 792439 - Implement ES6 WeakSet. r=till
Bug 792439 - Insert new lines at end of file. r=me
Bug 1054470 - Remove unused MOZ_APP_COMPONENT_INCLUDE r=glandium
Bug 1053048 Add tests for accessing selectionStart and selectionEnd from nsISelectionListener::NotifySelectionChanged() r=ehsan
Bug 1053048 nsTextEditorState::UnbindFromFrame() should ensure to call nsTextInputListener::EditAction() for updating the content r=ehsan
Bug 1053048 Implement nsIEditor.isInEditAction readonly attribute r=ehsan, sr=smaug
Bug 1007776 - Add a devtools API for muting the source AudioNodes; r=roc,smaug
Bug 1050731 - Push nspr libraries from jit-test.py with --remote. r=dminor
Bug 1053764 - IonMonkey MIPS: Fix params to addOutOfLineCode. r=kvijayan
Bug 1050219 - IonMonkey MIPS: Fix patching backedges while patched code is running. r=nbp
Bug 1046585 part 8 - Move X86Assembler.h and AssemblerBuffer.h into jit/. r=sunfish

--HG--
rename : js/src/assembler/assembler/AssemblerBuffer.h => js/src/jit/shared/AssemblerBuffer-x86-shared.h
rename : js/src/assembler/assembler/X86Assembler.h => js/src/jit/shared/BaseAssembler-x86-shared.h
Bug 1048874 - Remove unnecessary setting of media.webvtt.enabled pref in tests. r=rillian