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

merge from trunk
---

9b28ddca0d751a937382f269d274a902528ccfa4