Merge branch 'maint'
commit521d47b0190671ffd779a7f530f53c88cb15dc96
authorBastien Guerry <bzg@altern.org>
Sat, 9 Feb 2013 10:59:27 +0000 (9 11:59 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 9 Feb 2013 10:59:27 +0000 (9 11:59 +0100)
tree5227bfdd70bffd01148ebd9df581282782cc5373
parenta77d3f0bcda7240958968890b3f9d0607f0d8901
parent1056fc3f6052f36567af65568e6c306bc2a4624e
Merge branch 'maint'
doc/org.texi