]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '00192d5ab88ff9eeccbc1bc10cb534976a56963d' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:40:54 +0000 (12:40 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:40:54 +0000 (12:40 +0200)
1  2 
filter/config.Y
filter/filter.c

diff --cc filter/config.Y
Simple merge
diff --cc filter/filter.c
Simple merge