]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (14:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (14:19 -0700)

Trivial merge