]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b8fb4b ab50731)
Merge from upstream.
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (05:22 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (05:22 -0500)

Trivial merge