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

Trivial merge