From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 02:45:50 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2865
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71c3ecbadba97c8502afe8f5ab5b1b6edbf3f39a;p=emacs.git

merge from trunk
---

71c3ecbadba97c8502afe8f5ab5b1b6edbf3f39a