From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 Jan 2016 19:27:35 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2799
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe9c8b687c5121a413342024b62824a86d2de2be;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

7bf54d0 Backport kqueue integration from master
---

fe9c8b687c5121a413342024b62824a86d2de2be