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

merge from trunk
---

b795172d4c222b4fec6f9dbf1be726d27ca56df1