]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 21:58:01 +0000 (14:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 21:58:01 +0000 (14:58 -0700)
The following commit was skipped:

1b70aa6 Fix bug#20233, do not merge with master


Trivial merge