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

merge from trunk
---

4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d