]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '92f8878cbf5d8ad9e9b909a9dcbb2112de54a542' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:52:39 +0000 (12:52 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:52:39 +0000 (12:52 +0200)
1  2 
nest/rt-dev.c

diff --cc nest/rt-dev.c
Simple merge