Bug 920321 - Do not truncate the source line number in the web console; r=msucan
Bug 921366 - Fix output for throw false/0/null/undefined in Scratchpad; r=msucan
Merge m-c to fx-team on a CLOSED TREE
Bug 745187 - Don't introduce a delay notifying the frontend about new plugins added to the document, because script may immediately remove them from the page. To fix the delayed layout of XBL, introduce a separate method to calculate the notification icon visibility, r=jaws

Note: this patch still has one potential hole: if content creates a plugin and destroys it without forcing reflow, the XBL binding will not be instantiated. This doesn't appear to be a problem in practice, because every site that wants to use a plugin also has to trigger frame construction to get the plugin to instantiate (document.write of the embed element appears to do this automatically).
Bug 745187 part B - If a plugin is already activated, don't refresh the page.
Bug 932446 - in-content click-to-activate UI should look more clickable. Give the entire plugin a pointer cursor; reorder the vulnerable and activate sentences; underline the activate sentence so it looks like a clickable link; make the activate sentence red when :active so it also behaves more like a link, r=jaws ui-r=lco
Bug 932786 - CTP doorhanger does not update to show the new plugin state after the user clicks allow or block; update pluginInfo.fallbackType with the new state in gPluginHandler._updatePluginPermission, r=keeler
Bug 932880 - Make targets oblivious to inspectors. r=bgrins
Bug 932880 - Fix remaining DevTools bc leaks. r=past
Bug 932912 - Reflect.jsm should attach its export to 'this' so that it works in B2G; r=khuey
Backout cset 8ca9d85c1204 (bug 927172) due to viewport issues in metrofx. r=me
merge backout
Merge m-i to m-c
Merge f-t to m-c
Merge m-c to m-i
Bug 914255 - Reduce the number of objects tracked in a TypeSet, r=bhackett