]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 13 Nov 2015 22:41:41 +0000 (14:41 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 13 Nov 2015 22:41:41 +0000 (14:41 -0800)

Trivial merge