Merge branch 'maint'
commit4685fa25856f617aef1ecc41bf8d305e9ea6ec29
authorSven Verdoolaege <sven.verdoolaege@gmail.com>
Tue, 28 Aug 2018 18:06:34 +0000 (28 20:06 +0200)
committerSven Verdoolaege <sven.verdoolaege@gmail.com>
Tue, 28 Aug 2018 18:06:34 +0000 (28 20:06 +0200)
treef00d580726152001c00125033e869333b4045ea8
parent7bff91e4ed28e5ec880e00c066cd871425c10fc0
parent74dedde94c2a09db230aed7942487b1b1a75b230
Merge branch 'maint'
Makefile.am
configure.ac