Bug 1046500 - Fix mediagroup parsing in feed parser. r=mak
Merge m-c to fx-team
Bug 1049545 - use a mutation observer instead of a timeout to wait for the notification, r=mak

--HG--
extra : rebase_source : cdab7bb1fb64d167750de48ed5be92cbd0f1cd1c
Merge mozilla-central and fx-team
Bug 1048834 - Fixed empty sad feedback description field for Loop for predefined categories. r=Standard8,ui-review=darrin
Bug 1000771: Add a button to copy Loop urls to the clipboard. r=mikedeboer
Bug 998344 - Prevent console autocompletion on objects with a large number of properties. r=msucan

--HG--
extra : rebase_source : 6ea291d29775b4894f084e93f533a3ca5ddfb33e
Bug 1000625 - Move generic in-content styles from preferences.css to common.css. r=Unfocused

--HG--
rename : browser/themes/shared/in-content/common.css => browser/themes/shared/in-content/common.inc.css
extra : rebase_source : 5bbbecfcc91eada37a6806cae0946fa2fc2495f9
Bug 1000625 - Move generic in-content icons to in-content folder. r=Unfocused

--HG--
rename : browser/themes/shared/incontentprefs/check.png => browser/themes/shared/in-content/check.png
rename : browser/themes/shared/incontentprefs/check@2x.png => browser/themes/shared/in-content/check@2x.png
rename : browser/themes/shared/incontentprefs/dropdown-disabled.png => browser/themes/shared/in-content/dropdown-disabled.png
rename : browser/themes/shared/incontentprefs/dropdown-disabled@2x.png => browser/themes/shared/in-content/dropdown-disabled@2x.png
rename : browser/themes/shared/incontentprefs/dropdown.png => browser/themes/shared/in-content/dropdown.png
rename : browser/themes/shared/incontentprefs/dropdown@2x.png => browser/themes/shared/in-content/dropdown@2x.png
rename : browser/themes/shared/incontentprefs/help-glyph.png => browser/themes/shared/in-content/help-glyph.png
rename : browser/themes/shared/incontentprefs/help-glyph@2x.png => browser/themes/shared/in-content/help-glyph@2x.png
rename : browser/themes/shared/incontentprefs/sorter.png => browser/themes/shared/in-content/sorter.png
rename : browser/themes/shared/incontentprefs/sorter@2x.png => browser/themes/shared/in-content/sorter@2x.png
extra : rebase_source : 8f4e79dbb5b743397fe4c4d0aaf98cbf895659d8
Bug 1000625 - Merge xul and html common.css rules and update netError to match style. r=jaws, r=Unfocused, ui-r=mmaslaney

--HG--
extra : rebase_source : 630aa57db4f5aa188076651741357d6cde87f2ed
Bug 1000625 - Use consistent color specification style and inherit font for buttons. r=Unfocused

--HG--
extra : rebase_source : 655e8a981360eadc2e83fff173d528716d4fc228
Bug 1000625 - Add namespace for xul elements. r=Unfocused

--HG--
extra : rebase_source : 11f28304906c13a2f3b2843bbf4c6fc6d7085d3e
Bug 1030318 - Enable devtools/framework tests with e10s. r=mratcliffe

--HG--
extra : rebase_source : 2e8ea32540aa53661cb6985bbb55f9dfb4e2a30c
Bug 1038991 - DevTools security cert generator. r=dkeeler, r=past, r=gps

--HG--
extra : rebase_source : 91340b1e422f1d12333073f000b4c8c96dde8134
Bug 1047355 - Poll b2g-info for USS when possible. r=paul

--HG--
extra : rebase_source : 271c2ea0e141489b911487670128103e130fe4fa
Bug 1049085 - Correct list of tests for the robocop suite_start message. r=jmaher

--HG--
extra : rebase_source : 69920f81b45a9f0e3a5de945298c4e6218ba09d8
Bug 1049839 - Stop rejecting busyPromise. r=paul
Bug 1049938 - [rule view] Destroy the Add Rule menuitem when CssRuleView is destroyed. r=harth
Bug 1050033 - Eliminate BrowserDB interface. r=lucasr
Bug 1046579 - Don't scale empty view images. r=lucasr