]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)

Trivial merge