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

merge from trunk
---

d5ac6cccbe97aabd7b8d324aaae3716eb9853cb1