Merge branch 'maint'
commit5c8cc17d39865c500fe42f9130ae428de6f83487
authorBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 17:21:39 +0000 (7 18:21 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 7 Jan 2013 17:21:39 +0000 (7 18:21 +0100)
treeee4713c2e4ae83828bf1067f58ccca5da4784733
parentb54d6f5965a62c179f79a804efe4e4337c97b074
parent571d80dad98b38cd009c40fba4fdb9a5a8064a0f
Merge branch 'maint'
doc/org.texi
lisp/org.el