From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 09:46:28 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2725
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc468f0f25e0a9c10a4c7023a37cfc9be369b69d;p=emacs.git

merge from trunk
---

bc468f0f25e0a9c10a4c7023a37cfc9be369b69d