From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 08:41:15 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2654
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4ccda9e0071fab547036a2c1c6e7ff7a5db3286;p=emacs.git

merge from trunk
---

e4ccda9e0071fab547036a2c1c6e7ff7a5db3286