Merge upstream Org (from commit acbbe2)
commitbdebdb64b35d6a0a28e04335f4e8e46949206ad3
authorBastien Guerry <bzg@gnu.org>
Fri, 26 Oct 2012 14:42:05 +0000 (26 16:42 +0200)
committerBastien Guerry <bzg@gnu.org>
Fri, 26 Oct 2012 14:42:05 +0000 (26 16:42 +0200)
treeea3e0d00bd8da93ae89e86744a80f4e162c5361c
parentccc83f50a4ca55842bcf955b9f8156c17aa43864
Merge upstream Org (from commit acbbe2)
56 files changed:
doc/misc/ChangeLog
doc/misc/org.texi
etc/ChangeLog
etc/refcards/orgcard.pdf
etc/refcards/orgcard.tex
lisp/org/ChangeLog
lisp/org/ob-ditaa.el
lisp/org/ob-haskell.el
lisp/org/ob-io.el
lisp/org/ob-keys.el
lisp/org/ob-lob.el
lisp/org/ob-picolisp.el
lisp/org/ob-ref.el
lisp/org/ob-scala.el
lisp/org/ob-sql.el
lisp/org/ob-sqlite.el
lisp/org/ob-tangle.el
lisp/org/ob.el
lisp/org/org-agenda.el
lisp/org/org-archive.el
lisp/org/org-ascii.el
lisp/org/org-attach.el
lisp/org/org-bbdb.el
lisp/org/org-beamer.el
lisp/org/org-capture.el
lisp/org/org-clock.el
lisp/org/org-colview.el
lisp/org/org-compat.el
lisp/org/org-datetree.el
lisp/org/org-docbook.el
lisp/org/org-element.el
lisp/org/org-exp.el
lisp/org/org-faces.el
lisp/org/org-feed.el
lisp/org/org-footnote.el
lisp/org/org-freemind.el
lisp/org/org-html.el
lisp/org/org-icalendar.el
lisp/org/org-id.el
lisp/org/org-indent.el
lisp/org/org-install.el
lisp/org/org-irc.el
lisp/org/org-latex.el
lisp/org/org-lparse.el
lisp/org/org-mobile.el
lisp/org/org-odt.el
lisp/org/org-plot.el
lisp/org/org-publish.el
lisp/org/org-remember.el
lisp/org/org-src.el
lisp/org/org-table.el
lisp/org/org-taskjuggler.el
lisp/org/org-timer.el
lisp/org/org-version.el
lisp/org/org-xoxo.el
lisp/org/org.el