; Merge from origin/emacs-25

The following commits were skipped:

ff3fc21 Port to glibc 2.24 (pre-release) + ppc64
eb9d461 * lisp/net/shr.el (shr-fill-line): Withdraw the last commit (...
4157159 * lisp/net/shr.el (shr-fill-line): Preserve text properties i...
This commit is contained in:
Paul Eggert 2016-08-05 14:09:09 -07:00
commit f902a6b89e

Diff content is not available