]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)

Trivial merge