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

merge from trunk
---

a87e9c8f9fb3c2696bed6c1f8edb7542461d673c