Bug 891693 - Ban SOS with repeated components IDs. r=jmuizelaar, r=DRC, a=abillings
Bug 933272 - Click to play "Tap here to activate plugin." is not localized on multi-locale build. r=mfinkle, a=lsblakk
Bug 928800 - Doorhanger, while showing, should respect dynamic toolbar's dynamicness. r=mfinkle, a=lsblakk
Bug 932854 - When a site uses a hidden plugin, show a notification bar to aid discoverability. This patch, suitable for trunk and branch, uses existing strings which are not ideal. r=jaws, a=lsblakk
Bug 932854 - Test fixup: Reset the test plugin state only after the UI has finished checking plugin state. r=gfritzsche, a=lsblakk
Bug 932854 - Temporary test workaround for test_keycodes.xul. r=jimm, a=lsblakk
Bug 932854 - Add telemetry for showing the plugin infobar and its two buttons. r=jaws, a=lsblakk
Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy. r=gfritzsche, a=lsblakk
Bug 941137 followup - fix xpcshell test which expects the test plugin to be click-to-activate to actually set the state it desires. a=test-only
Bug 915184 - Wait for the default about:privatebrowsing page to appear before continuing the test. r=ehsan, a=test-only
Bug 934066 - Add a simple parent/child synchronization mechanism for xpcshell tests. r=ted, a=test-only
Bug 937404 - Remove the unused NotableStringInfo copy constructor. r=jimb, a=lsblakk
Bug 940925 - Don't inspect Baseline binary arithmetic IC if it had unoptimizable operands. r=bhackett, a=lsblakk
Bug 940925 followup - Add missing check that's required on beta on a CLOSED TREE.
Backed out changeset c524051861d5 (bug 915184) for test failures. a=backout.
CLOSED TREE
Bug 938030 - Fix race with PAC file loading causing frequent failures. r=ehsan, a=test-only
Bug 915184 - Wait for the default about:privatebrowsing page to appear before continuing the test. r=ehsan, a=test-only
CLOSED TREE
Bug 929009 - Disable WASAPI in cubeb.  r=kinetik a=akeybl

--HG--
extra : rebase_source : ab01572b96fd9fcced3814a1401ac7db63788aa4
Merge m-b to b2g26. a=merge