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)
commit2b0c260c3ceab5b2d5a4c3a04f7e2a0a357e9d75
tree1d2c15ff0d1a587c16ce79de5a87b5baf3ba472b
parentca10195d9af33c557b57f16b8bb93df1066ab0ee
parent664aca2d29b15dd75967d2bb0298caf750993b6f
Merge remote-tracking branch 'origin/master' into identity_abe
configure.ac