From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 06:47:50 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2823
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a263a505d444370bcd2f8d8d5231396d5152c7a;p=emacs.git

merge from trunk
---

7a263a505d444370bcd2f8d8d5231396d5152c7a