Bug 1110486 - Use .then instead of .catch to handle rejections in Tooltip.isValidHoverTarget as Markup View uses deprecated-sync-thenables; r=pbrosset
Bug 1015163 - Always show the menu button in popup windows. r=gijs,enn

--HG--
extra : rebase_source : 942adb801c3261cdfc23a7d9f57321206c5e22d4
Bug 1110069 - Replace getBrowser() with gBrowser. r=dao

--HG--
extra : rebase_source : 4db6c01d37ea4e38e94f70a677c5d31decd22f72
Bug 1106559 - improved Search preference pane for Firefox 35 - strings only, r=felipe.
Bug 1110101 - Bookmarks.remove doesn't remove folder contents properly. r=mak.
Backed out changeset 85a89a0a4c1c (bug 1110069)
Backed out changeset bc169301ff47 (bug 1015163) for bc1/bc2 test failures
Bug 1087618 - Part 1 : Introduce new tree styling. r=jaws
Bug 1090949 - Make Firefox OS Simulator accept launch options. r=ochameau
Bug 1098246 - Enhance browser_pdfjs_navigation.js to navigate using arrows keys. r=mossop
Bug 1102347 - Add jump to lines in the debugger from new performance call tree. r=vp
Bug 1109942 - Fixing a spelling error in the localization for devtools. r=Gijs
Bug 1107253 - Move mBaseUrl and mRawBaseUrl from BaseTest into BaseRobocopTest. r=mcomella
Merge mozilla-central to fx-team
Bug 1106991 - Added missing icon for Hello's "tour". r=nperriault
Bug 1109511: listen for the 'delete' event to update the toolbar icon when a room is deleted. r=Niko
Bug 1101378 - self-image can be cropped, meaning the user doesn't see the entire sent images, r=NiKo`
Bug 1008172 - Scrolling when focused on the tabbox should not change the selected tab for the in-content preferences. r=Gijs
Bug 1107133 - Expose tracking protection in Fennec privacy preferences. r=liuche

--HG--
extra : rebase_source : c871a80ba90ed7f5b4d626d4d04f64a7e6e74a4c
Bug 1050770 - Add paint details to timeline. r=smaug, r=mattwoodrow