org-effectiveness.el (org-effectiveness-plot): fix change of year

* org-effectiveness.el (org-effectiveness-plot): fix change of year
Merge branch 'master' of orgmode.org:org-mode
ox-icalendar: Use `org-icalendar-with-timestamps'

* lisp/ox-icalendar.el (org-icalendar-entry): Use
  `org-icalendar-with-timestamps'.

We cannot simply rely on ignored timestamps in communication channels,
as regular `org-export-with-timestamps' only applies to isolated
timestamps.

Thanks to Greg Troxel for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/85387
Fix commit 935b69e065

* lisp/ob-maxima.el (org-babel-execute:maxima): Correct a stray
  occurence of setting `org-babel-maxima-graphical-output-file´ to
  `org-babel-graphical-output-file´.
Merge branch 'maint'
ox-icalendar: Tiny fixes

* lisp/ox-icalendar.el (org-icalendar-include-sexps,
org-icalendar-blocked-headline-p): Fix docstrings.
(org-icalendar-clear-blank-lines): Fix docstring and regexp.
Merge branch 'maint'
org-element: Fix docstring

* lisp/org-element.el (org-element-timestamp-parser): Fix docstring.
Merge branch 'maint'

Conflicts:
	lisp/org-element.el
Fix bug introduced in commit fdb4b54e

Thanks to Leonard Randall for reporting it.
Merge branch 'maint'
allow specification of python command w/header arg

  Using the :python header arg.

* lisp/ob-python.el (org-babel-execute:python): Locally set
  `org-babel-python-command' using a header argument.
org-license.el (org-license-cc-by, org-license-cc-by-nd): Fix some urls.

* (org-license-cc-by, org-license-cc-by-nd): fix some urls.
Fix for assistant to create index; fix for occur-command
ox-ascii: Tiny fix

* lisp/ox-ascii.el (org-ascii--indent-string): Fix regexp to avoid
  stack overflow in regexp matcher on very long lines.
Merge branch 'maint'
Fix `org-flag-drawer'

* lisp/org.el (org-flag-drawer): Do not flag drawer when point is on
  an empty line after it.  When hiding the drawer away, make sure
  point always stays in a visible part of the buffer.

* testing/lisp/test-org.el (test-org/flag-drawer): Add tests.
Fix BBDB link completion

lisp/org-bbdb.el (org-bbdb-complete-link): Fix link completion with
newer versions of BBDB.

Newer versions of BBDB seem to be returning atomic values from
`bbdb-completing-read-record', we should be prepared for both atoms
and lists.
Merge branch 'maint'
org-capture.el (org-capture-fill-template): Fix bug

* org-capture.el (org-capture-fill-template): Deactivate
region while trying to align tags on the current headline.

Thanks to Alex Kosorukoff for reporting this.