]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff2c764 0d7aad1)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Apr 2016 16:07:16 +0000 (09:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Apr 2016 16:07:16 +0000 (09:07 -0700)
The following commits were skipped:

0d7aad1 Revert "Backport HTTPS proxy fix"
2d1a605 Backport HTTPS proxy fix


Trivial merge