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

merge from trunk
---

b3797d24ab7fd78fe54583b5f9a59e7bc87208cd