From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 06:21:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2676
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff7e4c63a5a19f795340ce9a7b9e2b5f55d50587;p=emacs.git

merge from trunk
---

ff7e4c63a5a19f795340ce9a7b9e2b5f55d50587