Fix compatibility with FireQuery 1.4.1 (related to issue 7445)
Fix compatibility with FireDiff 1.2.1 (related to issue 7445)
Fixing test console/grouping/cookies
Merge branch 'master' of github.com:firebug/firebug
Fix commandLine tests 1854, api/debug, dom (broken by a new command arrow image)
Fix test script/6566 (also related to a new command image)
Improved display of shortcuts
Merge branch 'master' of https://github.com/firebug/firebug.git
Issue 7382: In HTML edit mode, Ctrl+Z clears the editor contents
Merge branch 'master' of github.com:firebug/firebug
Remove timeouts after panels are destroyed (some panels can create new timeouts in destroy)
Issue 7396 (XHR requests don't apply to other filters)
http://code.google.com/p/fbug/issues/detail?id=7396

Part 1: Use white-listing for filters
Issue 7396 (XHR requests don't apply to other filters)
http://code.google.com/p/fbug/issues/detail?id=7396

Part 2: Allow to add multiple categories for a request
Merge branch 'issue7396'
Merge branch 'master' of https://github.com/firebug/firebug.git
Merge remote-tracking branch 'origin/master' into issue6557
Issue 7470: Breakpoint conditions are disregarde
Issue 7119: 	Cookies panel should sort cookies alphabetically by default
Issue 7034: 	Editing <body> in the HTML panel sometimes includes the highlighter HTML
Fixed adding of context menu items for network requests and improved
code and performance on setting filters
(see comments on https://github.com/firebug/firebug/commit/b006f20b67)