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

merge from trunk
---

b55a30c5d5e7d90ab8fa997f64c25a03bc923513