org-clock: Update syntax for indentation in clock tables

* lisp/org-clock.el (org-clocktable-indent-string): Use "\emsp"
  instead of "\__", which is not supported anymore since Org 8.0.

Thanks to Buddy Butterfly for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/88842
Merge branch 'maint'
ox-odt: Silence byte-compiler

* lisp/ox-odt.el (org-odt--format-paragraph): Change signature to
  include info.
(org-odt-footnote-reference, org-odt-paragraph): Apply signature
change.
Merge branch 'maint'
ox-ascii: Use options instead of defcustoms in code

* lisp/ox-ascii.el (org-ascii--current-text-width,
  org-ascii--build-title, org-ascii--build-toc,
  org-ascii--list-listings, org-ascii--list-tables,
  org-ascii-template--document-title, org-ascii-inner-template,
  org-ascii-template, org-ascii-code, org-ascii-drawer,
  org-ascii-headline, org-ascii-inline-src-block,
  org-ascii-format-inlinetask-default, org-ascii-inlinetask,
  org-ascii-link, org-ascii-paragraph, org-ascii-quote-block,
  org-ascii-section, org-ascii-src-block, org-ascii-table,
  org-ascii--table-cell-width, org-ascii-table-cell,
  org-ascii-verbatim, org-ascii-verse-block,
  org-ascii-filter-headline-blank-lines,
  org-ascii-filter-paragraph-spacing): Use options instead of
  hard coded variables.
ox-ascii: Fix line break preservation

* lisp/ox-ascii.el (org-ascii--justify-element): Fix line break
  preservation.

Thanks to Miguel Ruiz for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/88866
org-element: Fix object parsing in captions

* lisp/org-element.el (org-element-parse-secondary-string): Clone all
  local variables from current buffer before parsing a secondary
  string.  Small refactoring.
(org-element-object-variables): Remove variable.

* testing/lisp/test-org-element.el (test-org-element/secondary-string-parsing):
  Add test.

Thanks to Thomas S. Dye for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/88850
Merge branch 'maint'
org-element: Update regexps

* lisp/org-element.el (org-element--cache-sensitive-re): Update
  regexps.
ORG-NEWS: Add entries
contrib/lisp/org-contacts.el: Allow the user to customize interactively the vcard export

* contrib/lisp/org-contacts.el (org-contacts-export-as-vcard): Wrap
  `org-contacts-export-as-vcard-internal' to prompt for the parameters
  when called interactively.
(org-contacts-export-as-vcard-internal): The old function
  `org-contacts-export-as-vcard'.

Thanks to Esben Stien for the suggestion.
org-element: Fix parsing multi-line links

* lisp/org-element.el (org-element-link-parser): Properly handle
  multi-line links according to RFC 3986 when enclosed within square
  brackets.

* testing/lisp/test-org-element.el (test-org-element/link-parser): Add
  test.
Merge branch 'maint'

Conflicts:
	testing/lisp/test-org-element.el
test-org-element: Fix indentation

* testing/lisp/test-org-element.el (test-org-element/link-parser): Fix
  indentation.
Fix ID generation in org-rss-publish-to-rss

* contrib/lisp/ox-rss.el (org-rss-publish-to-rss): Fix a bug that
  causes ID properties to be generated in org buffer emacs is
  currently visiting rather than the file containing the feed.
Merge branch 'master' of orgmode.org:org-mode
testing/README: Changes to "Interactive testing"

* testing/README: Changes in "Interactive testing" instructions.
ox: Implement predicate for export blocks

* lisp/ox.el (org-export-raw-special-block-p): New function.

* testing/lisp/test-ox.el (test-org-export/raw-special-block-p): New
  test.

This patch is a forward-compatibility measure since the function is
mandatory for export back-ends in Org 8.3. It makes it easier for
back-end maintainers to provide a back-end compatible with both Org
8.2 and 8.3.
Merge branch 'maint'
org-element: Add `:raw-value' property to special blocks

* lisp/org-element.el (org-element-special-block-parser): Add
  `:raw-value' property.