Bug 1052220 - Show traces' hit counts. r=fitzgen
Bug 1053468 - When setting a breakpoint, only resume if we actually interrupted. r=past
Bug 950546 - Make color analyzer deterministic by breaking ties via comparing original colors. r=MattN
Bug 1058039 - Make sure that .addon-control subitem elements from Plugin Add-on Manager are not hidden (otherwise the state menu selectbox will not inherit a good width). r=Unfocused
merge fx-team to mozilla-central a=merge