]> code.delx.au - gnu-emacs/commit
; 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)
commit7b45cc583c4f16cc070a9925431ca944f510a685
tree9eb72adddeab4fb7b0cebf49df81ab31f3bf8a13
parentff2c76476479c43607825df01c78d8f239caefb5
parent0d7aad1b30de7e9deb8b3c7011d9b679e538371c
; Merge from origin/emacs-25

The following commits were skipped:

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