]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Merge branch 'origin/master'
authorJan Engelhardt <jengelh@medozas.de>
Sun, 8 Feb 2009 17:19:43 +0000 (18:19 +0100)
committerJan Engelhardt <jengelh@medozas.de>
Sun, 8 Feb 2009 17:20:32 +0000 (18:20 +0100)
(throw away remote three commits as they had been redone
in this local branch)


Trivial merge