From: Joakim Verona <joakim@verona.se>
Date: Sat, 14 Sep 2013 09:40:24 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2647
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b483f0f59ff7f125dfbe490e42eb84c238ac971;p=emacs.git

merge from trunk
---

2b483f0f59ff7f125dfbe490e42eb84c238ac971