From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 10:31:36 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2757
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c5dc5b6703306afe6970bf2d7553d085ceaa3f2;p=emacs.git

merge from trunk
---

9c5dc5b6703306afe6970bf2d7553d085ceaa3f2