]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a414bed 277c8f2)
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)

Trivial merge