From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Aug 2013 19:31:48 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2781
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd4e76c279715cbaa57465ea9ffbe68fb84d8299;p=emacs.git

merge from trunk
---

fd4e76c279715cbaa57465ea9ffbe68fb84d8299