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

merge from trunk
---

f1742c473f7bc90dbe65d523a895187b5e72853a