; Merge from origin/emacs-25
commitf902a6b89e6970eabaaf3c2c1452bf2104e2004b
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (5 14:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2016 21:09:09 +0000 (5 14:09 -0700)
tree9c9c2d5329af83b6cdf9de3871e268072b96ffeb
parenta855bf48d42cd7cbc9c72def3584fd354d433f97
parentff3fc21e24edffccce0d42065833e852a6792bd2
; 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...