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

merge from trunk
---

353722363daee341416e4de5952b6dea62eea7e6