From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 19:01:43 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2811
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=575dd3ba75231b7df64b3f2b88ef88909417cf38;p=emacs.git

merge from trunk
---

575dd3ba75231b7df64b3f2b88ef88909417cf38