From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 27 May 2015 16:49:29 +0000 (+0200)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~1956
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9fabb2bb099d944cc97a87933b86b9eae02d067;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/net/tramp.el
---

f9fabb2bb099d944cc97a87933b86b9eae02d067