Merge branch 'ipset'

Conflicts:
	doc/changelog.txt
This commit is contained in:
Jan Engelhardt
2011-08-12 15:37:50 +02:00
10 changed files with 138 additions and 61 deletions

View File

@@ -5,6 +5,7 @@ HEAD
- xt_TEE: abort build when the feature is already provided by mainline
- xt_psd: restore functionality with UDP
- xt_psd: support UDPLITE
- update to ipset 6.8
v1.37 (2011-06-25)