From: Joakim Verona <joakim@verona.se>
Date: Mon, 12 Aug 2013 20:14:05 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2867
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30e2a1217667de18501bba00899c43a6f410906b;p=emacs.git

merge from trunk
---

30e2a1217667de18501bba00899c43a6f410906b