Merge branch 'maint'
commit31d24aa2134e27670e15b059d597505673c0d0e2
authorBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 10:58:54 +0000 (13 11:58 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 13 Dec 2012 10:58:54 +0000 (13 11:58 +0100)
tree9673e54b67e20d25768306474b545b310c4f4bd1
parent8c04fb72cbd3b84ad1f7e8d9dc30397bcc24f7cf
parent82db0aab3bc843b8004b19231657018d425518c2
Merge branch 'maint'
doc/org.texi