Bug 1036299 - Show enhanced content image when the tile is unhovered [r=adw]
Place an image above the usual thumbnail to hide on hover. Have DirectoryLinksProvider keep a cache of enhanced links/images to use on history tiles.

--HG--
extra : rebase_source : e4d1ddafebf13c1723a79d889a7ca3039396bc0d
Bug 1042204 - Control the enhancement of history tiles with a pref [r=adw]
Only show enhanced history when the pref allows it. Update newtab pages when enhanced pref changes.

--HG--
extra : rebase_source : 3a7466d119df6d0bffef4a71e9142b1e21f077ed
Bug 1042092 - test consumeanchor behaviour, r=Enn

--HG--
extra : rebase_source : cd263845a1319eb9662885ec84da1de687705eec
Bug 1042502 - No need to removeObserver in Snippets r=margaret
Bug 1042513 - Clearing timer in Firefly shutdown is racy and not needed r=blassey
Bug 1041738 - Style search bar and suggestions. r=eedens
Bug 1006051 - Follow-up: correct over-zealous regex replace. r=trivial
Backed out changeset ee1a53319c19 (bug 1042092) for m-oth bustage
Merge m-c to fx-team
Bug 763671 - Simplify form styles in Fennec. r=mfinkle
Bug 1024073 - Whitelist plugin: Roblox Plugin launcher. r=gfritzsche
Bug 1029654 - Whitelist plugin: Box Edit. r=gfritzsche
Bug 1024965 - Whitelist plugin: Nexus Personal. r=gfritzsche
Backed out changeset 6acef5be504c (bug 763671) for android Reftest failures
Bug 987864 - Move API 13 styles to values-v13 folder. r=wesj

--HG--
rename : mobile/android/base/resources/values-v14/styles.xml => mobile/android/base/resources/values-v13/styles.xml
Bug 981041 - Add back preference to disable transitions in Style Editor. r=harth
Bug 1009078 - Console: Represent empty slots of arrays with a placeholder label instead of commas and whitespace. r=dcamp
Bug 1011116 - Reselect file in tree after folder is selected and file gets refocused. r=harth

--HG--
rename : browser/devtools/projecteditor/test/browser_projecteditor_tree_selection.js => browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js
Bug 1038695 - Show all cookies in Net Monitor, not just first. r=vporof
Bug 1038288 - Implement the updated InContent Preferences Design. r=jaws