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

merge from trunk
---

f909b7cfa7ccac86db11ea8698d01b167a7f37d6