From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 13:47:14 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6070fc71f3af2a40bc3402ac387665fa713fa8e5;p=emacs.git

merge from trunk
---

6070fc71f3af2a40bc3402ac387665fa713fa8e5