Merge remote-tracking branch 'origin/rte-update' into int-new

author Jan Moskyto Matejka <mq@ucw.cz>

Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)

committer Jan Moskyto Matejka <mq@ucw.cz>

Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)
author Jan Moskyto Matejka <mq@ucw.cz>
Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)
committer Jan Moskyto Matejka <mq@ucw.cz>
Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)
diff --cc nest/protocol.h
Simple merge
diff --cc nest/route.h
Simple merge
diff --cc sysdep/unix/krt.c
Simple merge
author	Jan Moskyto Matejka <mq@ucw.cz>
	Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)
committer	Jan Moskyto Matejka <mq@ucw.cz>
	Tue, 10 May 2016 12:21:15 +0000 (14:21 +0200)
		1	2
nest/protocol.h	patch \|	diff1 \|	diff2 \|	blob \| history
nest/route.h	patch \|	diff1 \|	diff2 \|	blob \| history
sysdep/unix/krt.c	patch \|	diff1 \|	diff2 \|	blob \| history