]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'master' into int-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Tue, 2 Jan 2018 15:59:59 +0000 (16:59 +0100)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Tue, 2 Jan 2018 15:59:59 +0000 (16:59 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge