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

merge from trunk
---

9de87b9a2f98b8f7b24b3a7b7cb1dfda7c562bf1