From: Joakim Verona <joakim@verona.se>
Date: Sat, 17 Aug 2013 11:26:52 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2784
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7a2af303596a96186af260a2b3cee24d4b4e4ed;p=emacs.git

merge from trunk
---

e7a2af303596a96186af260a2b3cee24d4b4e4ed