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

merge from trunk
---

19abe3206b243252aaac49e897a89cedb62e7b7b