Merge branch 'master' of orgmode.org:org-mode

contrib/README

@@ -30,7 +30,7 @@ org-eldoc.el             --- Eldoc documentation for SRC blocks
 org-elisp-symbol.el      --- Org links to emacs-lisp symbols
 org-eval-light.el        --- Evaluate in-buffer code on demand
 org-eval.el              --- The <lisp> tag, adapted from Muse
-org-eww.el               --- Store link to url of eww
+org-eww.el               --- Support link/copy/paste from eww to Org-mode
 org-expiry.el            --- Expiry mechanism for Org entries
 org-export-generic.el    --- Export framework for configurable backends
 org-git-link.el          --- Provide org links to specific file version

lisp/ox-html.el

@@ -114,8 +114,6 @@
     (:html-link-use-abs-url nil "html-link-use-abs-url" org-html-link-use-abs-url)
     (:html-link-home "HTML_LINK_HOME" nil org-html-link-home)
     (:html-link-up "HTML_LINK_UP" nil org-html-link-up)
-    (:html-head "HTML_HEAD" nil org-html-head newline)
-    (:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
     (:html-container "HTML_CONTAINER" nil org-html-container-element)
     (:html-mathjax "HTML_MATHJAX" nil "" space)
     (:html-html5-fancy nil "html5-fancy" org-html-html5-fancy)