fix test failure introduced by moving library-of-babel.org in 321f806faf

* testing/lisp/test-ob-lob.el: The file library-of-babel.org has been
  moved from contrib/babel to doc, change the code to track that move.
org.texi (History and Acknowledgments): Remove Jambunathan from my own acknowledgments

* org.texi (History and Acknowledgments): Remove Jambunathan from
my own acknowledgments.
Merge branch 'master' of orgmode.org:org-mode
contrib/lisp/: Fix some local variables settings
ox-latex: Introduce LATEX_HEADER_EXTRA keyword

* lisp/ox-latex.el (latex): Introduce new buffer keyword.
(org-latex-template): Use new keyword.
* lisp/ox-beamer.el (org-beamer-template): Use new keyword.
* lisp/org.el (org-create-formula--latex-header): Use new keyword.
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use new
  keyword.

Previewing of LaTeX snippets takes account of LATEX_HEADER keywords.
LATEX_HEADER_EXTRA keyword allows to specify some header lines that
will not be used for building snippets.
org.el (orgstruct-setup): Add `org-ctrl-c-minus' and `org-ctrl-c-star'

* org.el (orgstruct-setup): Add `org-ctrl-c-minus' and
`org-ctrl-c-star'.
Make `org-toggle-item' and `org-toggle-heading' behave more alike

* org.el (org-toggle-item): Convert all normal lines as items when
there is a region, and only convert the first line when called
with a universal prefix argument.  This is consistent with the
behavior of `org-toggle-heading'.
(org-toggle-heading): When the region contains only normal lines,
a universal prefix arg will only convert the first line.  This is
more consistent with `org-toggle-item'.
ox-icalendar: Fix error when `org-icalendar-store-UID' is non-nil

* lisp/ox-icalendar.el (org-icalendar-create-uid): Fix error when
  `org-icalendar-store-UID' is non-nil.
ox-md.el: Fix a library keyword in the comment section

* ox-md.el: Fix a library keyword in the comment section.
ox-md.el (org-md-export-as-markdown): Tiny docstring fix

* ox-md.el (org-md-export-as-markdown): Tiny docstring fix.
Merge branch 'master' of orgmode.org:org-mode
org.texi (History and Acknowledgments): Mention that Jambunathan rewrote the HTML exporter

* org.texi (History and Acknowledgments): Mention that Jambunathan
rewrote the HTML exporter.
org-agenda.el (org-agenda-refile): Enhance docstring.  Allow to clear the refile cache with C-0 or C-u C-u C-u

* org-agenda.el (org-agenda-refile): Enhance docstring.  Allow to
clear the refile cache with C-0 or C-u C-u C-u.
ox-html.el (org-html-format-inline-image): Don't add superfluous <p></p> when there is an empty caption

* ox-html.el (org-html-format-inline-image): Don't add superfluous
<p></p> when there is an empty caption.
ox-latex: Fix overuse of default width/height

* lisp/ox-latex.el (org-latex--inline-image): Do not use default
  width (resp. height) when an user height (resp. width) is provided.
  Also, default height is only used when image is not wrapped within
  a figure or wrapfigure environment, in order to preserve ratio.
(org-latex-image-default-width, org-latex-image-default-height):
Update docstring.
org-agenda.el (org-agenda-day-view): Fix parameter's name

* org-agenda.el (org-agenda-day-view): Fix parameter's name.
Merge branch 'master' of orgmode.org:org-mode
org.texi (Installation): Detail instructions when installing through ELPA

* org.texi (Installation): When installing Org from ELPA, users
should do this from an Emacs session where no .org file has been
visited.
org-element.el (org-element-map): Fix tiny typo in docstring

* org-element.el (org-element-map): Fix tiny typo in docstring.
ox-html.el (org-html-template): Always include the title.

* ox-html.el (org-html-template): Always include the title as <h1
class="title"></h1>, even when there is no title, as org-info.js
needs it.

Thanks to Henry Atting for reporting this.