Bug 862398 - Maintain the order of tools in the tab and the options panel list, r=past
bug 867450 - Type in JSTerm.prototype._fetVarProperties; r=msucan
Bug 865680 - Remove the last of the two devtools.gcli.allowSet lines; r=mratcliffe
Bug 795978 - Error: this._containers is undefined in MarkupView.jsm Line: 327; r=mratcliffe
Bug 832231 - After a reload, breakpoints require multiple resumes to allow execution to continue; r=vporof
Bug 795978 - Backout - Error: this._containers is undefined in MarkupView.jsm Line: 327; r=orange
bug 808369 - Use VariablesView in the Scratchpad; r=msucan
bug 679364 - Use content/browser/devtools/* for aliases; r=rcampbell
Bug 740541 - Style sheets in iframes are not listed in the style editor; r=harth
merge m-c to fx-team
Merge m-c to m-i.