From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Aug 2013 14:07:59 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2732
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de9a6574cc346bf3d8fb90e46cd4d62a42249817;p=emacs.git

merge from trunk
---

de9a6574cc346bf3d8fb90e46cd4d62a42249817