]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit '64534ea2f4361c247d7a0d1b6b14a02e8e3d6d33' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 13:31:46 +0000 (15:31 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 13:31:46 +0000 (15:31 +0200)
commit054bc43a5c60398865b37cd75aae2f0a965b87d3
tree06b5d89aa2f920772e1e2a20af09a72540e3b8d9
parent52ceae6144b334c64e33d9bf18d5c188bb112be7
parent64534ea2f4361c247d7a0d1b6b14a02e8e3d6d33
Merge commit '64534ea2f4361c247d7a0d1b6b14a02e8e3d6d33' into integrated

Conflicts:

sysdep/bsd/krt-sock.c
sysdep/bsd/krt-sock.c