Bug 1034855 - Introduce EcKeyAlgorithm r=rbarnes,smaug
Bug 1034855 - Implement generateKey() for ECDH r=rbarnes,keeler
Bug 1034855 - Implement deriveBits() for ECDH r=rbarnes,smaug
Bug 1034855 - Implement JWK import/export for ECDH r=rbarnes,keeler
Bug 1034855 - Implement deriveKey() for ECDH r=rbarnes
Bug 1034855 - Implement SPKI import/export for ECDH r=keeler,rbarnes
Bug 1049302: Avoid audio delay in B2G audio-video getUserMedia captures r=roc
Bug 1049035: Don't redeclare arg 'msg', in health report function '_recordProviderError'. r=gps
Bug 1049052: Use the style context on the root element's primary frame (if it exists) to resolve rem units, instead of re-resolving style. r=dbaron
Bug 1002281 - WebGL2 - Refactor common functions into WebGLBindableName.; r=jgilbert

WebGLBindableName represents a GL 'name' (GLuint) that can be bound to
part of the GL state machine. Similar code appeared in a number of
classes that represent GL bindable names, such as WebGLBuffer,
WebGLTexture, WebGLFramebuffer, etc.

Cleanup to reduce copy-n-paste code that's needed for creating new
objects for WebGL 2.

--HG--
extra : source : ad7803e3daf5862099f62f24fdbc83639be1ed5a
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