Deleted 2012-11-28-your-filename.md
Merge branch 'master' of git://orgmode.org/org-mode
Merge orgmode.org:org-mode
Merge from org repo
Merge branch 'master' of git://orgmode.org/org-mode
Fix inline images display

* lisp/org.el (org-display-inline-images): Rewrite function.
ox: Fix comment
ox: Add :input-buffer to communication channel

* lisp/ox.el (org-export--get-buffer-attributes): Add :input-buffer
  property.
Prevent flagging drawers in example blocks

* lisp/org.el (org-flag-drawer): Rewrite function using Elements.
  Also prevents flagging drawers within example blocks.
* testing/lisp/test-org.el (test-org/flag-drawer): Add test.
Fix small bug

* lisp/org.el (org-display-inline-images): Fix bug introduced in
  cab0d40593d75227aa47f80d3de7b9c3a74c3bb4.
Merge branch 'master' of github.com:bzg/org-mode
ox: Fix OPTIONS in default template

* lisp/ox.el (org-export-insert-default-template): Make sure strings
  are properly quoted when inserting a template.  Specifically,
  default value for drawers should be d:(not "LOGBOOK"), not d:(not
  LOGBOOK).
Merge branch 'maint'
Merge branch 'master' of orgmode.org:org-mode
Fix wrong-type-argument error when opening id link

* lisp/org.el (org-open-at-point): Check if link is non-nil before
  matching it.

Reported-by: Daniel Clemente <n142857@gmail.com>
Merge branch 'maint'
org-element: Implement caching for dynamic parser

* lisp/org-element.el (org-element-use-cache, org-element--cache,
org-element--cache-sync-idle-time,
org-element--cache-merge-changes-threshold, org-element--cache-status,
org-element--cache-opening-line, org-element--cache-closing-line): New
variables.
(org-element-cache-reset, org-element--cache-pending-changes-p,
org-element--cache-push-change, org-element--cache-cancel-changes,
org-element--cache-get-key, org-element-cache-get,
org-element-cache-put, org-element--shift-positions,
org-element--cache-before-change, org-element--cache-record-change,
org-element--cache-sync): New functions.
(org-element-at-point, org-element-context): Use cache when possible.
* lisp/org.el (org-mode, org-set-modules): Reset cache.
* lisp/org-footnote.el (org-footnote-section): Reset cache.
* testing/lisp/test-org-element.el: Update tests.

This patch gives a boost to `org-element-at-point' and, to a lesser
extent, to `org-element-context'.
Merge branch 'master' of orgmode.org:org-mode
Fix flyspell behaviour on verbatim objects

* lisp/org.el (org-do-emphasis-faces): Look for verbatim status at
  correct location.
Merge branch 'maint'