Merge branch 'maint'
commit4dd9f392c1b5ff5050e0f7a136aae546420267ba
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Aug 2014 19:56:57 +0000 (24 21:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Aug 2014 19:56:57 +0000 (24 21:56 +0200)
treefbbeafbe87912600619074be64c579eb81039803
parent11e9fcc50cad126b7542c6fdb464d86c74ff726b
parent896fa6d1f7dc58a4937f542e38a48ff69c0fddfd
Merge branch 'maint'
doc/orgguide.texi