]> granicus.if.org Git - ipset/commit
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)
commit57d871ad46bfaed44e556cb872f4bfab1004d9e1
tree05aba4c451f5d6a7025db633d22c556f55d9f351
parent06366c172c487b3038b52e8fe640747b4092a544
parent95b9dfb393232f384ccfc671971a0a9387e138d4
Merge branch 'master' of git://dev.medozas.de/ipset into ipset-5

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>