; Merge from origin/emacs-25
commit20e1d54a3fbbcccaa46225be63ccfa2bc60d64c8
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:01 +0000 (5 14:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:07:01 +0000 (5 14:07 -0700)
tree5b609435fb29b6f62766ddd51d8649013913970e
parent1a86b5d6074d26d1a3a978cb52b2147b6f359694
parenta5dcc97babfcb20bd146376fec99a20b9320e9be
; Merge from origin/emacs-25

The following commit was skipped:

a5dcc97 Fix open-network-stream responsiveness