From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 10:31:41 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2833
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d;p=emacs.git

merge from trunk
---

2d22a50de5de4dd7a952cb0ae7e7db7ee82a8a7d