Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 21:33:52 +0000 (8 22:33 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 21:33:52 +0000 (8 22:33 +0100)
1  2 
doc/org.texi

diff --cc doc/org.texi
Simple merge