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

merge from trunk
---

09af8568ed7255dd764a8c4ca050776ced66c366