Bug 1015525: changes to translation prefs are now recorded by FHR. r=rnewman
Bug 911209 - Display hidden nodes differently in the markup-view; r=miker
Bug 966242 -  Get rid of flicker when rule view is refreshed;r=pbrosset
Merge mozilla-central to fx-team
Bug 1019885 - Fix broken import of disabled hosts from previous profiles. r=dolske
Bug 870205 - Fix intermittent browser_bug295977_autoscroll_overflow.js. r=neil
Bug 978143 - Propagate APK install cancellation back to webpage. r=wesj
Bug 1020587 - Update pretty-fast to latest upstream. r=me
Bug 1014242 - Delay loading of distribution quickshare lists. r=wesj
Bug 1019595 - Use light cancel edit button with dark lightweight themes. r=bnicholson

--HG--
rename : mobile/android/base/resources/drawable-hdpi/close_edit_mode.png => mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
rename : mobile/android/base/resources/drawable-mdpi/close_edit_mode.png => mobile/android/base/resources/drawable-mdpi/close_edit_mode_light.png
rename : mobile/android/base/resources/drawable-xhdpi/close_edit_mode.png => mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
Bug 1015617 - listen for hiding the panel immediately, r=mikedeboer
Bug 997765 - Define initial list of suggested sites (r=mfinkle)
Bug 997765 - Change bg color and image for blank spots in top sites (r=mfinkle)
Merge fx-team to m-c a=merge