]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba46f4d 8889f4e)
Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)

Trivial merge