Wes Kocher db15df3e50 Merge m-c to inbound, a=merge CLOSED TREE		2016-11-04 15:19:49 -07:00
..
base	Bug 1313098 - Assert we only access heap state on the main thread r=sfink r=mccr8	2016-11-04 17:32:36 +00:00
ipc	Bug 1312530 - Force windowless plugin mode in 64-bit builds if async rendering is disabled. r=akotz	2016-10-25 08:10:54 -05:00
test	Bug 1314812 - Remove code that manually times out loads in favor of relying on the test harness. r=Gijs	2016-11-02 16:03:11 -07:00