From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 08:51:44 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2858
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6eb8619434f2278f3e56663bc7bbb31043b6146b;p=emacs.git

merge from trunk
---

6eb8619434f2278f3e56663bc7bbb31043b6146b