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

merge from trunk
---

9a99d023d5c806d71bd645e50251977790f1a134