From: John Wiegley Date: Fri, 13 Nov 2015 22:41:41 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into emacs-25 X-Git-Tag: emacs-25.0.90~804 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d71d2471aaf341791fd728287bf8db62aebb3ba;p=emacs.git Merge remote-tracking branch 'origin/master' into emacs-25 --- 4d71d2471aaf341791fd728287bf8db62aebb3ba