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

merge from trunk
---

193622bc5caed8701ccbd714f3e1ef2bc33b5dcd