From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 23 Oct 2016 09:43:18 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1449
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e892e1158619f546182e990f927abea02cdf5db3;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

d70ed8a Fix time-related data types in 2 editfns.c functions
99892ee Port to Ubuntu 16.10, which needs gcc -nopie
---

e892e1158619f546182e990f927abea02cdf5db3