Bug 1048857 - stripPrefix shouldn't empty out www or protocol tokens if there's nothing else in them, r=paolo
Bug 1040931 - Add extensionID parameter to addEngineWithDetails r=gavin
Bug 1055012 - Verify sessions we're killed before starting load on Chromecast. r=mfinkle
Merge m-c to fx-team. a=merge
Bug 1031033: String changes for tracking protection pref (r=adw)
Merge fx-team to m-c a=merge