org.el (org-in-src-block-p): Return t when on #+BEGIN|END_SRC lines.

* org.el (org-in-src-block-p): Return t when point is at the
#+BEGIN_SRC/#+END_SRC lines unless the new optional parameter
'inside is set to t.
org-src.el (org-edit-src-code): Check if we are in a source code block with `org-in-src-block-p'.

* org-src.el (org-edit-src-code): Check if we are in a source
code block with `org-in-src-block-p'.  Slightly reformat the
docstring.
org.el (org-edit-special): Fix bug about editing special environments.

* org.el (org-in-fixed-width-region-p): New function.
(org-edit-special): Fix bug: make sure to DTRT in every
special environment.  Also use the new function to check
against fixed-width environment.

Thanks to Bernt Hansen for reporting a bug in this area.
Merge branch 'maint'
org.texi: Update copyright notice.

There are no invariant sections and no cover texts.

See http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Documentation.html
for details on why we don't need invariant sections and cover texts.
Merge branch 'maint'
orgguide.texi: Fix the copyright notice.

See http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=cd2496
for explanations on the same change for org.texi.
Merge branch 'maint'
* contrib/lisp/org-e-texinfo.el: Remove messages used for debugging
(org-e-texinfo--generate-menu-items): Remove messages used for debugging.
org-koma-letter: Add asynchronous export support

* contrib/lisp/org-koma-letter.el (org-koma-letter-export-as-latex,
  org-koma-letter-export-to-latex, org-koma-letter-export-to-pdf): Add
  asynchronous export support.
org-export: Fix docstring

* contrib/lisp/org-export.el (org-export-stack-mode): Fix docstring.
Add doclicense.texi to include the GNU FDL license and fix the copyright notice.

The GNU FDLv1.3 is now included in both the manual and the guide.
The Back-Cover Texts does not mention that you can buy copies from
the FSF as this is not true.
Merge branch 'maint'
Merge branch 'master' of orgmode.org:org-mode
contrib/lisp/org-bullets.el: New file by Evgeni Sabof

Implements a minor mode to show org-mode bullets as UTF-8 characters.
contrib/lisp/org-e-confluence.el: New file by Sébastien Delafond
testing/org-test.el: Fix `org-test-with-temp-text'.

* org-test.el (org-test-with-temp-text): No need to kill a
temporary buffer.  Don't use (prog1 ,@body ...), only expand
,@body.

Thanks to Nick Dokos for pointing this.
test-org-src.el: Fix a test.

* lisp/test-org-src.el (test-org-src/blank-line-block): Use
`org-test-with-temp-text-in-file' because `org-in-src-block-p'
checks against an Org mode text property.  Don't check for the
word at point.

Thanks to Nick Dokos for reporting this failed test.
Merge branch 'maint'
org-test.el (org-test-with-temp-text-in-file): Wrap ,@body into (progn ...).

* org-test.el (org-test-with-temp-text-in-file): Wrap ,@body
into (progn ...) so that tests don't have to wrap it themselves.

Fix the testing suite to use this.
Also fix formatting and trailing whitespaces.
Fix test-org-src/blank-line-block so that it
checks editing of a code block with a whitespace
with point on the #+begin_src line.

Thanks to Michael Brand for spotting the (progn ...) problem.