Merge branch 'maint'
commitc356b114d760ac3e7c6b64f5ed665e3394a8a131
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 10:40:55 +0000 (15 11:40 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 10:40:55 +0000 (15 11:40 +0100)
treee963e8a2930f1a8c16a0eda5ed6b8ce9f9d280a1
parent17e11fe41916b299481717c2eb4e6a257c792b10
parent64d9159ad0407bc4f9fbf698d0fe05e41c4f4585
Merge branch 'maint'
doc/org.texi