Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 5 Oct 2017 15:11:17 +0000 (17:11 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 5 Oct 2017 15:11:17 +0000 (17:11 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge