From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 10:32:03 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2797
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b1afd6ad231b5ba95436632d94f0bc81eacab27;p=emacs.git

merge from trunk
---

4b1afd6ad231b5ba95436632d94f0bc81eacab27