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

merge from trunk
---

1272f71a5f83232f2b2c25a6d8ec24ebe1ea0a63