From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 13:42:07 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2830
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89ba610e09b1be18ad96f502d7b06938c016e76c;p=emacs.git

merge from trunk
---

89ba610e09b1be18ad96f502d7b06938c016e76c