Bug 946316 - Allow the use of strings as DataStore IDs, r=ehsan
Backed out changeset 73af05ec57fc (bug 950503) for build bustage on a CLOSED TREE
merge mozilla-central to mozilla-inbound on a CLOSED TREE
Bug 942730 - allow Marionette to type into input type=number fields; r=mdas
Bug 949879 - Drop support for the "cols" attribute of <pre> elements. r=dbaron
Bug 915449 - Avoid EditText error in testMasterPassword; r=jmaher
Bug 926069 - CacheFile must not create new entry when key is a hash, r=honzab
Bug 920952 - Flush metro test harness output. r=bbondy
Bug 950288 - Update the last run id when the browser launches so it's always up to date. r=bbondy
bug 887321 - initial OCSP stapling telemetry r=briansmith
Bug 950736 - Don't use target of included file to perform WebIDL codegen; r=ted

Make blissfully ignores failures when processing targets of "include"
directives. This was causing failures of WebIDL codegen to be ignored
and causing make to get in a loop.

--HG--
extra : rebase_source : 1231255705315319b308b4303bc3fc41237fbfa0
extra : amend_source : cfd801d7a3490a2a712994a60e548e3482a4992e
Bug 950028 - Remove unused js_AddNativeProperty. r=jorendorff
Bug 946898.  Make sure to not accidentally store COWs in the slot for [Cached] properties.  r=peterv
Bug 946909.   For a [Cached] or [StoreInSlot] attribute with a setter, clear the cache on set.  r=peterv
Bug 942480: Don't js_delete a freshly allocated js::Debugger, if we've stored it in the Debugger JSObject's private slot. r=shu
Bug 946529 - Fix bug in transform parsing mochitest; r=longsonr
Bug 942152, r=dkeeler, r=honzab

--HG--
extra : rebase_source : 7f0bab4efa26e9c185b29fdb14d846035147fd2f
Bug 947661 - Fix offset test used to find the block chain for a pc.
Merge m-c to m-i
Bug 865033 part 1. Remove GetLayerManager from CompositorParent. r=mattwoodrow