]> code.delx.au - gnu-emacs/commitdiff
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 15 Apr 2013 13:44:14 +0000 (16:44 +0300)
committerEli Zaretskii <eliz@gnu.org>
Mon, 15 Apr 2013 13:44:14 +0000 (16:44 +0300)

Trivial merge