From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 15:07:07 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2773
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d284dbfc4bd3766bdc55d1ce816a0219636376e;p=emacs.git

merge from trunk
---

3d284dbfc4bd3766bdc55d1ce816a0219636376e