| commit | ebf81627b1a2f50fd47add49f9976ed430a19673 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Jun 10 22:53:51 2011 -0700 |
| committer | JP Abgrall <jpa@google.com> | Fri Jun 10 22:53:51 2011 -0700 |
| tree | 47694f53138cafb1a2a6940f817f4248219d6228 | |
| parent | 7ba421f1d968e5aa819bc5b49bd40cd127daa5fa [diff] | |
| parent | c960bde4a82792c285110589cf8b2cf1438e1b8f [diff] |
Merge git://git.netfilter.org/iptables into v1.4.11_upstream Using theirs, as they have taken some of my prior changes\ with some improvements. Conflicts: include/xtables.h.in iptables/xtables.c iptables/xtoptions.c Change-Id: I8e1e537fbb868eeebb448c8f1d9e33b283448aac