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

merge from trunk
---

55497105a66ffe094014399687a18153619f08ed