]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1aa119 6ea3f01)
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sun, 31 Mar 2013 12:36:07 +0000 (15:36 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 31 Mar 2013 12:36:07 +0000 (15:36 +0300)

Trivial merge