Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 27 Nov 2016 17:43:43 +0000 (18:43 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 27 Nov 2016 17:43:43 +0000 (18:43 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge