Merge branch 'maint'
commit050e332e0b217a792d901715b4024d44dbeb477f
authorBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 18:19:46 +0000 (27 20:19 +0200)
committerBastien Guerry <bzg@altern.org>
Sun, 27 Jul 2014 18:19:46 +0000 (27 20:19 +0200)
treed7c28889ce5f9e71712825612cc2c636680da290
parentac4b11e5651f8b1173b25c649b38b22a2b5f7235
parent3fd24ed2a024542f98ae481c9ad5bc30c993d552
Merge branch 'maint'
doc/org.texi