; Merge from origin/emacs-25

The following commit was skipped:

5cac11a Make parse-time-string-chars faster
This commit is contained in:
John Wiegley 2016-03-03 23:53:26 -08:00
commit b50a20709f

Diff content is not available