Merge branch 'maint'
commite81ed15d7d547c624b0682c54a62cdca506981cc
authorBastien Guerry <bzg@altern.org>
Wed, 30 Jan 2013 16:46:54 +0000 (30 17:46 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 30 Jan 2013 16:46:54 +0000 (30 17:46 +0100)
tree6d318e4b3f38f0720f431b5f4aa7d31e7291e539
parent8e8f40ce2fadf46336238f7843b1c654e9dcec2c
parent4890bbed8c8d26b270c412cbcc6e65c508473801
Merge branch 'maint'
doc/org.texi