Merge branch 'maint'
commit56f1b8095f1303044c0e3288d1f4b3ba58dc76f1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 17 Nov 2016 22:54:57 +0000 (17 23:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 17 Nov 2016 22:54:57 +0000 (17 23:54 +0100)
tree35889da8132f018331d23279d7c37c09e763b83e
parent047451c29defc5573a820c69102af1dbaf800999
parentb9ed40c4b51a3fc3c9cf167a22f73a046f5619d7
Merge branch 'maint'
doc/org.texi