]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec041b5 5ae255c)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 05:16:02 +0000 (22:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 05:16:02 +0000 (22:16 -0700)

Trivial merge