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

merge from trunk
---

cfb926eb66f52143a3951aaa0b1ac6b11f686c53