From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 19:21:56 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2826
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b15597dcec4aaa6c4f35138da2471f6dd4fb003;p=emacs.git

merge from trunk
---

0b15597dcec4aaa6c4f35138da2471f6dd4fb003