Bug 879293 - Allow alt+click to select only one category of messages in the console; r=msucan
Bug 722267 - Option to enable/disable timestamps for messages in the console; r=msucan
Merge mozilla-central and fx-team
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
Bug 883404 (UI portion) - Disable running plugins on the current page when the user chooses "Block", r=jaws
Bug 932854 test fixup - reset the test plugin state only after the UI has finished checking plugin state, r=gfritzsche
Bug 931183 - Remove dead TabOpenListener code from click-to-play tests. r=gfritzsche
Bug 937569 - Peek tab doesn't work for links with new targets. r=mbrubeck
Bug 935189: Use OS.File to remove directories recursively. r=Unfocused
bug 936637 fix context menu in status panel, r=markh
Bug 722267 - Fix browser_webconsole_expandable_timestamps.js test failure on a CLOSED TREE; r=me
Bug 932854 followup - Clear the plugin infobar after test_bug391728.html so that it doesn't affect later tests. a=ryanvm for pushing on a CLOSED TREE
Merge m-c to fx-team on a CLOSED TREE.
Backed out changesets 2e36a398a61f, fd2aafdc34d0, and 8f2cd9cf4d65 (bug 932854) for Windows mochitest-other crashes on a CLOSED TREE.
Merge fx-team to m-c