Merge branch 'maint'
commit5a36318511f5696c03b21cba0992b05c1e6d97dd
authorBastien Guerry <bzg@altern.org>
Fri, 28 Jun 2013 07:13:41 +0000 (28 09:13 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 28 Jun 2013 07:13:41 +0000 (28 09:13 +0200)
treeb2442bb0c4ce5ea31ee6c02cb201c889f6660f0b
parentaa500b1eaaeec071f8eb6ec3c022144d74b6249c
parent1aaa934eb25681c5b99856311712cdf8cd52a97b
Merge branch 'maint'
doc/org.texi
lisp/ob-core.el
lisp/org-table.el