Backport typo fix from Emacs revno r116017
Merge branch 'maint'
Fix bug when demoting invisible headlines

* org.el (org-demote): Ignore invisible text when aligning
tags.
(org-set-tags): When JUST-ALIGN is 'ignore-column, ignore
invisible text when restoring the cursor to the correct
column.

This fixes a bug about demoting hidden headlines.
If org-move-to-column temporarily ignore visibility
specs, this will prevent org-demote to work correctly
in hidden regions.

Thanks to Susan Cragin for reporting this bug.
Merge branch 'maint'
Merge branch 'master' of orgmode.org:org-mode
Fix mode reset
Merge branch 'maint'

Conflicts:
	lisp/org.el
Revert "org.el (org-store-link): When a link has been stored, always returns it"

This reverts commit 035087777d0b4d91373466ed1a56f357c63f5465.
Fix 035087777
Merge branch 'maint' of orgmode.org:org-mode into maint
Merge branch 'maint'

Conflicts:
	lisp/org.el
Merge branch 'master' of orgmode.org:org-mode
Fix 4a9820
Remove spurious defvar

Thanks to Nicolas Goaziou for reporting this.
Fix bf0649
Merge branch 'maint'
org.el (org-src-fontify-natively): Default to `t'

* org.el (org-src-fontify-natively): Default to `t'.

Thanks to Sébastien Vauban for pushing this.
org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4

* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4

* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
Merge branch 'maint'