Merge branch 'maint'
commit70e4a89a5d4d1bd353dd5fb586efa6342ec788c3
authorBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 19:44:21 +0000 (27 21:44 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 27 Oct 2012 19:44:21 +0000 (27 21:44 +0200)
tree14b560fd408e86d4c717f04f63876f8575d0078e
parentd81982ae9d26dd4fd84f6e8d8878ca0c1305889c
parent4aa416876b5482206a6fc790604d1a686b4ef6dd
Merge branch 'maint'
doc/org.texi