]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c94c34 12a106a)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Apr 2012 17:07:06 +0000 (10:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Apr 2012 17:07:06 +0000 (10:07 -0700)

Trivial merge