Merge branch 'maint'
commitb617d407ed9171de7dde130b354bd5766095af62
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 10:55:44 +0000 (15 11:55 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 10:55:44 +0000 (15 11:55 +0100)
tree75ac3f7e85c410506aa42600bce0b8a3fe696ae1
parentc356b114d760ac3e7c6b64f5ed665e3394a8a131
parent7a80881d6537109caca98564a724854b29db9a51
Merge branch 'maint'
doc/org.texi