Merge commit 'e7c2380260f20a4a3587b47df97879ef91c69774' into integrated

author Ondrej Zajicek <santiago@crfreenet.org>

Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)

committer Ondrej Zajicek <santiago@crfreenet.org>

Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)
author Ondrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)
committer Ondrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)
diff --cc filter/filter.h
Simple merge
diff --cc nest/proto.c
Simple merge
diff --cc nest/route.h
Simple merge
author	Ondrej Zajicek <santiago@crfreenet.org>
	Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)
committer	Ondrej Zajicek <santiago@crfreenet.org>
	Tue, 29 Apr 2014 13:16:32 +0000 (15:16 +0200)
		1	2
filter/filter.h	patch \|	diff1 \|	diff2 \|	blob \| history
nest/proto.c	patch \|	diff1 \|	diff2 \|	blob \| history
nest/route.h	patch \|	diff1 \|	diff2 \|	blob \| history