Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 11:53:04 +0000 (12:53 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 9 Jan 2013 11:53:04 +0000 (12:53 +0100)
1  2 
doc/org.texi

diff --cc doc/org.texi
Simple merge