From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 18:47:01 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2683
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef064bb6241bc76840ebf5875d6e6a4c0e8003a2;p=emacs.git

merge from trunk
---

ef064bb6241bc76840ebf5875d6e6a4c0e8003a2