From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 17:32:02 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2814
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0139d01ea2cca819089cb0264c0391a72180f556;p=emacs.git

merge from trunk
---

0139d01ea2cca819089cb0264c0391a72180f556