Merge branch 'maint' into newage

This commit is contained in:
Jan Engelhardt
2012-11-12 19:01:31 +01:00
33 changed files with 44 additions and 44 deletions

View File

@@ -345,7 +345,7 @@ static void __exit rawnat_tg_exit(void)
module_init(rawnat_tg_init);
module_exit(rawnat_tg_exit);
MODULE_AUTHOR("Jan Engelhardt <jengelh@medozas.de>");
MODULE_AUTHOR("Jan Engelhardt ");
MODULE_DESCRIPTION("Xtables: conntrack-less raw NAT");
MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_RAWSNAT");