Merge branch 'hotfix-7.8.06'
commitc187c512af169e142414f181398209678fd04659
authorBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 15:58:01 +0000 (2 17:58 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 2 Apr 2012 15:58:01 +0000 (2 17:58 +0200)
treef85cc7aec70f31fef075eb1d8e1cd862ec524a0f
parent7d64e883b0c2982c31fbb3c379a2c28221b04807
parent60b6f60dfefc063c7af9c6a3f168cb9c323d525b
Merge branch 'hotfix-7.8.06'
doc/org.texi
doc/orgcard.tex
doc/orgguide.texi
lisp/org.el