From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 13 Nov 2014 15:29:20 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: emacs-25.0.90~2635^2~495
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d856e6b0d87fed67001e83fcfccba9c932af3487;p=emacs.git

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

Conflicts:
	lisp/ChangeLog
---

d856e6b0d87fed67001e83fcfccba9c932af3487
diff --cc lisp/ChangeLog
index 6db9f206d15,725ef4d3c07..e3baa30ce6a
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-11-13  Michael Albinus  <michael.albinus@gmx.de>
 +
 +	* vc/vc-hg.el (vc-hg-state): Disable pager.  (Bug#18940)
 +
+ 2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+ 	* net/eww.el (eww-form-file): Fix version number.
+ 
+ 2014-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+ 	* net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.
+ 
  2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
  
          * net/eww.el(eww-form-file(defface)): New defface of file upload form.