Merge branch 'maint'
commit5352d9b155a2a3225405588c243782018787782b
authorBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 06:40:36 +0000 (6 07:40 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 06:40:36 +0000 (6 07:40 +0100)
tree7e7e0b719f79fb2313a35a7dc953e058be873a5e
parent8a401f8175ae512af0b82486eb7e9eb1eff0b046
parent129ecf99fa5c045d67822743f0d3af5b61b86adc
Merge branch 'maint'
doc/org.texi