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

merge from trunk
---

478550fa09602bf403812fc5597416c2a4aa441e