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
Bug 881410 - Remove some TI code we no longer need without JM. r=bhackett
Bug 877760 - XPConnect always logs an error when a component doesn't implement a method. r=mrbkap
Bug 878705 - Don't scroll when clicking inside the scrollbar track next to the scrollbar thumb. r=roc
Bug 845190 - Revert previous attempt to fix and re-disable tests.
Bug 768742 - Support multiple clauses of OS/2 IME. r=masayuki
Bug 879767 - Intermittent testMasterPassword | GeckoEventExpecter - blockForEvent timeout: DOMContentLoaded. r=jmaher
Bug 785929 - Kill FrameMetrics.mContentRect. r=kentuckyfriedtakahe
Bug 881483 - Remove noOptions constant in favor of an object literal. r=yoric
Bug 879168 - IonMonkey: Improve the typeset of |this| when inlining a constructing call, r=bhackett
Merge m-c to inbound.
Bug 881223: Issue warnings on GC bailouts.  r=nmatsakis
Backed out changeset 94fb66d82988 (bug 877584)
Backed out changeset 2864e2610800 (bug 877584) for causing bug 881266
Merge fx-team to m-c.
Merge inbound to m-c.