Don't take the slow async path when source maps are not enabled or present (bug 873224); r=rcampbell f=nfitzgerald
Bug 864249 - Add option to toggle JavaScript to Toolbox Options panel r=jwalker
Bug 879692 - New OSX scrollbars are not compatible with the devtools floating scrollbars. r=harth
Bug 861338 - [browserconsole] Cache Console.jsm API calls with ConsoleAPIStorage.jsm; r=jwalker
Merge fx-team to m-c.
Merge inbound to m-c.
Merge m-c to inbound.