Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 27 Aug 2015 18:55:54 +0000 (20:55 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 27 Aug 2015 18:55:54 +0000 (20:55 +0200)
1  2 
doc/org.texi

diff --cc doc/org.texi
Simple merge