From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Jan 2015 21:29:10 +0000 (+0100)
Subject: merge master
X-Git-Tag: emacs-25.0.90~2599
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e2255017323c54feeaaee220175d7761a3b6ed1;p=emacs.git

merge master
---

5e2255017323c54feeaaee220175d7761a3b6ed1