From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 21:01:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2768
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc11c16f9970babaca1a0278f6b4552f4eff9d38;p=emacs.git

merge from trunk
---

fc11c16f9970babaca1a0278f6b4552f4eff9d38