]> git.ipfire.org Git - thirdparty/ipset.git/commitdiff
projects / thirdparty / ipset.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c76d78 b31b2d6)
Merge branch 'master' of git://dev.medozas.de/ipset
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Wed, 12 Jan 2011 12:33:11 +0000 (13:33 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Wed, 12 Jan 2011 12:34:04 +0000 (13:34 +0100)
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

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