0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-02-04 07:10:03 +00:00
Ondrej Zajicek a485fd2909 Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated
Conflicts:

	nest/rt-table.c
	proto/bgp/attrs.c
	proto/bgp/packets.c
	proto/ospf/ospf.c
	proto/rip/rip.c
	proto/static/static.c
	sysdep/unix/krt.c
2014-04-29 17:23:38 +02:00
..
2013-11-25 13:44:07 +01:00
2009-05-11 01:32:49 +02:00
2012-04-30 15:31:32 +02:00
2013-11-22 02:48:44 +01:00
2012-04-30 22:25:24 +02:00