From: Joakim Verona Date: Wed, 11 Sep 2013 10:31:33 +0000 (+0200) Subject: merge from trunk X-Git-Tag: emacs-25.0.90~2689 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41390a42c5c18af8a112d7481875fe25e42b659c;p=emacs.git merge from trunk --- 41390a42c5c18af8a112d7481875fe25e42b659c