From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 13:35:32 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2668
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e85e5849326ef68f54e7d21abc2bf898c158a37;p=emacs.git

merge from trunk
---

9e85e5849326ef68f54e7d21abc2bf898c158a37