From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 15:42:45 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2817
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50bedb930dc5a15cb7cb5d689d9f1726a14fb158;p=emacs.git

merge from trunk
---

50bedb930dc5a15cb7cb5d689d9f1726a14fb158