Merge branch 'maint'
commitc8bb89facaab20dd762c9c04286a2e61cd502c30
authorBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:32:24 +0000 (30 10:32 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 30 Dec 2013 09:32:24 +0000 (30 10:32 +0100)
tree9230a37c3a11f93e997e02ac9e6e6a44f0e7212e
parent360014a9847af8ff0679c3a7ce93f572667a4c30
parent8bb519d9346668b34a3b407fc76204b180588fc6
Merge branch 'maint'
doc/org.texi
lisp/org-agenda.el
lisp/org-inlinetask.el
lisp/org.el
lisp/ox-texinfo.el
lisp/ox.el