Merge branch 'maint'
commit832b6e66ea453a01dbb7b2b4f49513e9cb782a0f
authorBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 21:33:52 +0000 (8 22:33 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 8 Jan 2013 21:33:52 +0000 (8 22:33 +0100)
tree5bc64e3592877b03972a5a77ac389561fb1a27ca
parentbb15139ab7f6ebddf7842b01cced7ecbe7b485e5
parent8c5a46c35d431197dc879fc473b97721bb2d9aa5
Merge branch 'maint'
doc/org.texi