]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (19:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (19:37 +0300)

Trivial merge