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

merge from trunk
---

5b3399e3bbd8ce641e15f3234e65b9a68940eb98