]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2016 22:02:03 +0000 (15:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2016 22:02:03 +0000 (15:02 -0700)
The following commits were skipped:

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


Trivial merge