From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 11 Jan 2015 15:00:33 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2603^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3eebe9bbd78b16557b003a75f42bf1225c90414;p=emacs.git

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

Conflicts:
	lisp/ChangeLog
---

a3eebe9bbd78b16557b003a75f42bf1225c90414
diff --cc lisp/ChangeLog
index fba541fbc29,679de0ce6aa..598f9c6a720
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2015-01-11  Michael Albinus  <michael.albinus@gmx.de>
 +
 +	* files.el (directory-files-recursively): Do not include
 +	superfluous remote file names.
 +
+ 2015-01-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+ 	* net/eww.el (eww): Interpret anything that looks like a protocol
+ 	designator as a full URL.
+ 
  2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
  	* net/shr.el (shr-urlify): Don't bother the user about