Merge branch 'maint'
commit4f0b3bfe0cd0f1433195a33641f0ea18c4166e57
authorBastien Guerry <bzg@altern.org>
Tue, 2 Oct 2012 11:07:09 +0000 (2 13:07 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Oct 2012 11:07:09 +0000 (2 13:07 +0200)
treee5bc2b4b31624bccd3350e2a6cf9e8166cb74049
parent2a95a47c5f5b1b07ad8d9509455eb816f46075ae
parent16e0730342725b7ff9a76d0a355dbc574ceced00
Merge branch 'maint'
doc/org.texi
doc/orgguide.texi
lisp/ob.el
lisp/org-agenda.el
lisp/org-clock.el
lisp/org-colview.el
lisp/org-element.el
lisp/org-exp.el
lisp/org-publish.el
lisp/org-taskjuggler.el
lisp/org.el