From: Joakim Verona Date: Thu, 12 Sep 2013 12:21:46 +0000 (+0200) Subject: merge from trunk X-Git-Tag: emacs-25.0.90~2670 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=314d47bc4ee53d17035983012e8a1e3c45612b27;p=emacs.git merge from trunk --- 314d47bc4ee53d17035983012e8a1e3c45612b27