Merge branch 'maint'
commit9265513c5e8d0a28a575f1135e890a1ba8f8d554
authorBastien Guerry <bzg@altern.org>
Fri, 11 Jan 2013 12:34:30 +0000 (11 13:34 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 11 Jan 2013 12:34:30 +0000 (11 13:34 +0100)
tree0845fba6d83800f9b13f53992c65038ded84f1a9
parent69133332aa626d499fe1a8c87ddfdc5a32f43230
parentd5268b051beab339aa08e17a9aa3d7be5cf500e5
Merge branch 'maint'
doc/org.texi