]> code.delx.au - gnu-emacs/commitdiff
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)

Trivial merge