Bug 1013586 - Backout diagnostic patch 2e9bcf014247.
Bug 1024256 - Blacklist S3TC extension on OSX 10.9 Intel HD 3000 driver because of buggy glCompressedTexSubImage2D with sub-image update; r=jgilbert
Bug 1025106: if someone passes us a bogus videocodec config, say it's 'unknown' r=pkerr
Bug 1025343: fix issues with overlong codec names in AudioConduit r=pkerr
Bug 1024510 - Unbreak --with-system-nss build after bug 1022812. r=mshal
Bug 1024064 - webgl-1.0.3 Initialize all vertex attributes to default values. r=jgilbert
Bug 982355 - Support disclosure-{open,closed} counter styles. r=jfkthame
Bug 985825 - Unprefix -moz-ethiopic-numeric. r=jfkthame
Bug 1025359 - Correct -moz-tamil according to Predefined Counter Styles. r=jfkthame
Bug 1011748 - Added logic to GetStatusText to ensure the statusText is available after all redirects (if any) have been followed. r=bz
Bug 1011748 - Mochitest unit test + resource files for this bug. r=bzbarsky
Bug 330964 - Fix cellspacing call in CalcUnpaginagedHeight. r=roc
Bug 1024986 - Use Preferences::AddBoolVarCache for dom.testing.ignore_ipc_principal check, r=ehsan
Bug 998513 - Test GeneralizedTime encodings in mozilla::pkix. r=keeler.
Bug 1015785 - Fix Moz2D's AlignedArray::Realloc() to not over allocate. r=Bas
Bug 1023336, part 1 - Add a Moz2D helper to consistently limit the size of data-wrapping DataSourceSurface buffers. r=Bas
Bug 1023336, part 2 - Use the new BufferSizeFromStrideAndHeight helper where appropriate in Moz2D code. r=Bas
Bug 1020695: Update Mozilla to use NSS 3.16.2 Beta 4. Includes fixes for
bug 1013088, bug 996237, bug 970539, bug 1016567, bug 485732, bug 334013,
bug 959864, bug 1016836, bug 1016811, bug 1018536, bug 996250, bug 1009227,
bug 963150, bug 1007126, bug 1021102.
Bug 1019753, part 2 - Use Moz2D DataSourceSurfaces instead of Thebes gfxImageSurfaces in DocumentRendererParent.cpp and ImageEncoder.cpp. r=mattwoodrow

--HG--
extra : rebase_source : fc39f0aede22e48ea853b1978eddeb8cc8c43a60
Bug 1024842 - Make StructuredDataType a typed enum in order to avoid C++11 narrowing conversion warnings when the values of the enum are used in the switch statement later in the file; r=Waldo