From: Joakim Verona <joakim@verona.se>
Date: Sat, 24 Aug 2013 13:17:24 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2735
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7;p=emacs.git

merge from trunk
---

8131fcfd622dd2b7fccf09b0f6a1c3f4747619a7