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

merge from trunk
---

c635a4f3d114db265e574f106710f497b2a450b6