Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 17:55:43 +0000 (18 19:55 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 18 May 2013 17:55:43 +0000 (18 19:55 +0200)
1  2 
doc/org.texi

diff --cc doc/org.texi
Simple merge