Bug 1021110 - Icons in about:newtab's search panel should be high-res (2x DPI) on high-res displays. r=ttaubert
Bug 1026359 - FxAccounts will try and log an undefined variable on error. r=jedp
Merge m-c to fx-team
merge fx-team to mozilla-central a=merge