| commit | 73dcee35a394b0fcf83f99d278bc03515de07d4b | [log] [tgz] |
|---|---|---|
| author | Florian Westphal <fw@strlen.de> | Sat Nov 23 23:50:17 2013 +0100 |
| committer | Florian Westphal <fw@strlen.de> | Sat Nov 23 23:50:17 2013 +0100 |
| tree | c7adf02dcfeceb736ff151ab029f82670eec361e | |
| parent | 482c6d3731e2681cb4baae835c294840300197e6 [diff] | |
| parent | 76e230e41947576efb96e86e605bb84015cdb287 [diff] |
Merge branch 'stable-1.4.20'
... to get 76e230e ('iptables: link against libnetfilter_conntrack'),
else static build doesn't work.
Conflicts:
extensions/GNUmakefile.in
[ CPPFLAGS was added in master, so keep it ]
Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar>