Merge branch 'maint'
commit1c4ac932f3a047e7f668307ced8ecb0f78189fdc
authorBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 16:43:41 +0000 (1 18:43 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 1 May 2012 16:43:41 +0000 (1 18:43 +0200)
tree63ba51bcdacd694458ab033a037e60aa501b8971
parent805891523c466643f2efa9c2d5561fdfa8862e7c
parent9fa0b5e794c92aa1c7ad03217fb412be8cd68bfb
Merge branch 'maint'
doc/org.texi