Merge branch 'hotfix'
commitfe5e004e39633706005512bc40d7d215028b34d0
authorBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 10:30:55 +0000 (11 12:30 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 11 Apr 2012 10:30:55 +0000 (11 12:30 +0200)
tree5aa3e1f56fbf38ba8e5bc91430fae81d4390b3df
parent37557ef1031b33c64cd0f1112b3c4d37d12ca70f
parent148e8c772487a6fcfd34891e14b7a3c1843631ab
Merge branch 'hotfix'
doc/org.texi
doc/orgcard.tex
doc/orgguide.texi
lisp/org.el