]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c4026b 119b2d4)
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 17:37:57 +0000 (20:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 17:37:57 +0000 (20:37 +0300)

Trivial merge