Merge branch 'maint'
commit6e51188ead293aeb7d3006501d8aec606cdcf6f6
authorBastien Guerry <bzg@altern.org>
Thu, 2 Jan 2014 15:11:08 +0000 (2 16:11 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 2 Jan 2014 15:11:08 +0000 (2 16:11 +0100)
tree803169403f13ed224354296751d627c956d1b85d
parent3c4a99c7312293a11431d8e357faa91a6f1f04c0
parent03ce57e7dba06ab26d80cbec5a1a3045a0caa7e3
Merge branch 'maint'
doc/org.texi