Merge branch 'abe' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 8 Jul 2017 16:41:35 +0000 (18:41 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 8 Jul 2017 16:41:35 +0000 (18:41 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge