Merge branch 'master' of orgmode.org:org-mode
raise useful error when obe-bibtex-file isn't set
Revert ""cite" link type in contrib/org-bibtex-extras"

This reverts commit 03c141a00e38d66f29f84950002fea0b10d5816f.
ox-bibtex handle missing ebib or bibtex2html

  If ebib is missing then the jump function from org-bibtex-extras.el
  will be used if defined, else no jump function will be used.

  Only call `org-bibtex-process-bib-files' on html export so that
  ox-bibtex may be used for latex export without bibtex2html being
  installed.
ox-html: Fix TOC entries

* lisp/ox-html.el (org-html--format-toc-headline): Add missing
  headline number in TOC entries.  This fixes commit
  4c94c4d062ce7aa28bc21301ec34857745029f5c.
Merge branch 'maint'
org-compat: Support for getting data from Windows clipboard

* lisp/org-compat.el (org-get-x-clipboard): Use w32-get-clipboard-data
to get the clipboard data under Windows.

TINYCHANGE
Merge branch 'maint'
Fix export of links to attachments (part 2)

* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  a property, as both `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
Fix export of links to attachements (part 2)

* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  properties, as `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
Merge branch 'maint'
whitespace fixes
set location info parameter for inline src blocks

* lisp/ob-core.el (org-babel-execute-src-block): Set location info
  parameter for inline src blocks.
  (org-babel-get-src-block-info): Set location info parameter for
  inline src blocks.
inline src block parser set "switches" in info

* lisp/ob-core.el (org-babel-parse-inline-src-block-match): Inline src
  block parser set "switches" in info, otherwise later offset are broken.
Remove old comment

The comment was introduced (in git) at commit
4be4c56239c224094e717dcd57068f58f99c2dfc ; it refers to a
FIXME located ~40 lines above it. The FIXME was removed in
dc8bc8e39230bde1eca569c564e65bf85c43de54.
Use key-description on the keys mentionned by the functions defined by
`orgtbl-mode'.
Merge branch 'maint'
org-inlinetask: Small clean-up
Fix some defconst and docstrings

* lisp/org.el (org-drawer-regexp, org-clock-drawer-start-re,
  org-clock-drawer-end-re): Fix docstring.
(org-clock-drawer-re): Fix value
Optimize hiding all drawers in a buffer

* lisp/org.el (org-cycle-hide-drawers): Make sure each drawer is only
  flagged once.