From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 4 Nov 2016 22:02:03 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1369
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66b5222c3cd72839bf72e0b2a03912719c930451;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

5043e0a Fix documentation for 'eudc-options-file'
26038aa Fix documentation of 'eudc-inline-expansion-format'
---

66b5222c3cd72839bf72e0b2a03912719c930451