]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '1149aa977d906a6400f998d5f6600871584395d0' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Sun, 18 May 2014 12:51:18 +0000 (14:51 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Sun, 18 May 2014 12:51:18 +0000 (14:51 +0200)
1  2 
nest/proto.c
proto/bgp/packets.c

diff --cc nest/proto.c
Simple merge
Simple merge