Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 3 Sep 2014 17:56:47 +0000 (19:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 3 Sep 2014 17:56:47 +0000 (19:56 +0200)
1  2 
doc/orgguide.texi

Simple merge