From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 07:22:12 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2657
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1a3b0d491f830e1fe5ce29aad325ec9dd4ebde1;p=emacs.git

merge from trunk
---

f1a3b0d491f830e1fe5ce29aad325ec9dd4ebde1