Merge branch 'maint'
commite54cf318ee37634ee31b1da5dbe7606e4b2fa068
authorBastien Guerry <bzg@altern.org>
Mon, 6 Oct 2014 12:29:01 +0000 (6 14:29 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 6 Oct 2014 12:29:01 +0000 (6 14:29 +0200)
tree0fa7275355e1048c22c3fc1a791aed3ae1f31b1a
parent9c6495760932aa243433334039a8616a174cd03d
parentdf3b24fe8aea2c35dca604e28d7e2e1dbf52a650
Merge branch 'maint'
doc/org.texi
doc/orgguide.texi