Merge branch 'opts' of git://dev.medozas.de/iptables

author Patrick McHardy <kaber@trash.net>

Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)

committer Patrick McHardy <kaber@trash.net>

Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)
author Patrick McHardy <kaber@trash.net>
Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)
committer Patrick McHardy <kaber@trash.net>
Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)
diff --cc include/xtables.h.in
Simple merge
diff --cc xtables.c
Simple merge
author	Patrick McHardy <kaber@trash.net>
	Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)
committer	Patrick McHardy <kaber@trash.net>
	Mon, 9 May 2011 18:23:21 +0000 (20:23 +0200)
		1	2
include/xtables.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
xtables.c	patch \|	diff1 \|	diff2 \|	blob \| history