]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f518ae9 6307db3)
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