Merge branch 'maint'
commit28b8476bb941091bf8ac06869f99769976a66689
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 19:49:43 +0000 (23 20:49 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 19:49:43 +0000 (23 20:49 +0100)
tree7169fb0fa91996955a58c4249b17162c39e7a0e0
parentf9b501bc18cd189f81919d55203e9a847d1e69f0
parentc7c9477260750fae3eac4ed937e4c060661cdfc9
Merge branch 'maint'
doc/org.texi