From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 5 Aug 2016 21:09:09 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2814
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f902a6b89e6970eabaaf3c2c1452bf2104e2004b;p=emacs.git

; 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...
---

f902a6b89e6970eabaaf3c2c1452bf2104e2004b