]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe5c5d3 04963aa)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 05:58:30 +0000 (22:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 05:58:30 +0000 (22:58 -0700)

Trivial merge