From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 14:17:54 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2721
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a896e4c89e06e92a53317c72b2863b84bb585d4d;p=emacs.git

merge from trunk
---

a896e4c89e06e92a53317c72b2863b84bb585d4d