Merge branch 'maint'
commit643b4d31bd4431b2f00d24cff7fa5be304dc4b7f
authorAchim Gratz <Stromeko@Stromeko.DE>
Wed, 28 May 2014 14:26:17 +0000 (28 16:26 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Wed, 28 May 2014 14:26:17 +0000 (28 16:26 +0200)
treea02ea8497bca1508f5c6cc8280c3c7d7b114f358
parent5bf928bae7beda83d47301e1bec08a67a33a4766
parent20ec9efb3e4371bdcc3c778f45a0e8925ac90cde
Merge branch 'maint'
doc/org.texi