Re-enable the browser_dbg_reload-same-script.js test after the fix (bug 782179); r=me
Bug 828070 - Update SourceMap.jsm from mozilla/source-map to get the |sources| getter; r=rcampbell
Merge m-c to fx-team
Backout 409adccbcbd7 (bug 782179)
Bug 820735 - [toolbox] Tools shortcuts should work from the toolbox window, r=paul