From: Joakim Verona <joakim@verona.se>
Date: Sat, 17 Aug 2013 08:23:04 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2787
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e5b2bb6c6b7e8bdd54a52a33678603c9e09ba54;p=emacs.git

merge from trunk
---

6e5b2bb6c6b7e8bdd54a52a33678603c9e09ba54