]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
projects / thirdparty / ipset.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06366c1 95b9dfb)
Merge branch 'master' of git://dev.medozas.de/ipset into ipset-5
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Mon, 20 Dec 2010 10:54:26 +0000 (11:54 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Mon, 20 Dec 2010 10:54:35 +0000 (11:54 +0100)
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

Trivial merge
Mirror of git://git.netfilter.org/ipset