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

merge from trunk
---

1db221681d0f80405475e9b5a018a7da2db770a5