Merge branch 'master' into rip-new

author Ondrej Zajicek (work) <santiago@crfreenet.org>

Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)

committer Ondrej Zajicek (work) <santiago@crfreenet.org>

Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)
author Ondrej Zajicek (work) <santiago@crfreenet.org>
Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)
committer Ondrej Zajicek (work) <santiago@crfreenet.org>
Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)
diff --cc lib/ip.c
Simple merge
diff --cc lib/ip.h
Simple merge
diff --cc nest/rt-table.c
Simple merge
author	Ondrej Zajicek (work) <santiago@crfreenet.org>
	Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)
committer	Ondrej Zajicek (work) <santiago@crfreenet.org>
	Tue, 24 Nov 2015 14:21:11 +0000 (15:21 +0100)
		1	2
lib/ip.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ip.h	patch \|	diff1 \|	diff2 \|	blob \| history
nest/rt-table.c	patch \|	diff1 \|	diff2 \|	blob \| history