]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
The following commit was skipped:

35cbe20 src/process.c Correctly convert AF_INET6 addresses


Trivial merge