From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 15:21:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2819
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98f2993e4d15fc5b57cdbe212634527c630b919d;p=emacs.git

merge from trunk
---

98f2993e4d15fc5b57cdbe212634527c630b919d