Merge branch 'maint'
commitf8e17454407e52a8d87fbafc32985693478be536
authorBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 13:19:03 +0000 (7 14:19 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 7 Jan 2014 13:19:03 +0000 (7 14:19 +0100)
treec8a2970df7cb732786aa1963fea2607fd7ac477a
parentccbe3965b131663bb4944514a209f5b6a3b79d09
parent7d9a883b50e2674fff5ebfc14faaa5f3537dcbee
Merge branch 'maint'

Conflicts:
contrib/lisp/org-favtable.el
50 files changed:
contrib/lisp/org-bibtex-extras.el
contrib/lisp/org-collector.el
contrib/lisp/org-contacts.el
contrib/lisp/org-mac-link.el
contrib/lisp/org-wikinodes.el
contrib/lisp/ox-bibtex.el
contrib/lisp/ox-confluence.el
contrib/lisp/ox-groff.el
contrib/lisp/ox-rss.el
doc/orgguide.texi
lisp/ob-C.el
lisp/ob-R.el
lisp/ob-clojure.el
lisp/ob-comint.el
lisp/ob-core.el
lisp/ob-emacs-lisp.el
lisp/ob-exp.el
lisp/ob-fortran.el
lisp/ob-gnuplot.el
lisp/ob-lisp.el
lisp/ob-ref.el
lisp/ob-ruby.el
lisp/ob-shell.el
lisp/ob-sql.el
lisp/ob-tangle.el
lisp/org-capture.el
lisp/org-clock.el
lisp/org-colview.el
lisp/org-element.el
lisp/org-feed.el
lisp/org-footnote.el
lisp/org-inlinetask.el
lisp/org-list.el
lisp/org-macro.el
lisp/org-mobile.el
lisp/org-pcomplete.el
lisp/org-src.el
lisp/org-table.el
lisp/ox-ascii.el
lisp/ox-latex.el
lisp/ox-man.el
lisp/ox-md.el
lisp/ox-org.el
lisp/ox-texinfo.el
lisp/ox.el
testing/lisp/test-ob-sh.el
testing/lisp/test-ob.el
testing/lisp/test-org-element.el
testing/lisp/test-ox.el
testing/org-test.el