; 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'
This commit is contained in:
Paul Eggert 2016-11-04 15:02:03 -07:00
commit 66b5222c3c

Diff content is not available