; Merge from origin/emacs-25
commite892e1158619f546182e990f927abea02cdf5db3
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2016 09:43:18 +0000 (23 02:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2016 09:43:18 +0000 (23 02:43 -0700)
treef432bbffba80979cec74cfc125a9f73abfd06a91
parent6129cd03e20a0aaee46ceb742a9ed1ae2904eab3
parentd70ed8aaeae8529813f591ce548631e424d853a2
; 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