Merge branch 'maint'
commitbeea46fab570e4307c2ccfbbc692033f4f4fadf9
authorBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 05:39:42 +0000 (15 06:39 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 15 Dec 2012 05:39:42 +0000 (15 06:39 +0100)
tree97d779b193d3b54e9975c8f441f8b37ccf8841cb
parent68d4de2f2cda34851cd91540a586f7bfd67244a2
parent0b44eb6961323de8254976f7f7ee973078cd2103
Merge branch 'maint'
doc/org.texi
doc/orgguide.texi