From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 18:27:11 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2844
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=527a4d099e6ad4a5615c28c3071757ad3a0dbf9a;p=emacs.git

merge from trunk
---

527a4d099e6ad4a5615c28c3071757ad3a0dbf9a