]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:16:24 +0000 (14:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:16:24 +0000 (14:16 -0700)

Trivial merge