Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 4 Apr 2019 12:03:41 +0000 (14:03 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 4 Apr 2019 12:03:41 +0000 (14:03 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge