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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 6db9f206d15c47dd37e16aa73f75a0dfe98db16c,725ef4d3c073b502475a0ec1df6b61a25e8a8039..e3baa30ce6a6bae18b1ab50e5e9318e6852051c6
--- 1/lisp/ChangeLog
--- 2/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.