From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 16:25:42 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2651
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=042cbea14ec32d91ccb99115f81814f508b8603b;p=emacs.git

merge from trunk
---

042cbea14ec32d91ccb99115f81814f508b8603b