From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 20:26:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2843
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2e32ba803f53e08cc65f75d51a4a8c3e01357b3;p=emacs.git

merge from trunk
---

f2e32ba803f53e08cc65f75d51a4a8c3e01357b3