From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 17:47:27 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2741
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fd8418c4004d593b9f37c55ed5b9c5ca221c72b;p=emacs.git

merge from trunk
---

0fd8418c4004d593b9f37c55ed5b9c5ca221c72b