From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 07:22:05 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2758
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9cfa8679176a2b74722f242a7a3c1fbd19d5097;p=emacs.git

merge from trunk
---

c9cfa8679176a2b74722f242a7a3c1fbd19d5097