diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-02-08 18:19:43 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2009-02-08 18:20:32 +0100 |
commit | 1eb619f3a0508d62847c311e69a09f4a8534c4df (patch) | |
tree | 7ea8f2daedc6d1aebf87e6ca9e7d244a855aedb6 /iptables-xml.c | |
parent | 77f48c2f1ef21fa43aa68c25a1457db319ca2526 (diff) | |
parent | 212092173b63be8532d95241bbd86db96e110220 (diff) |
Merge branch 'origin/master'
(throw away remote three commits as they had been redone
in this local branch)
Diffstat (limited to 'iptables-xml.c')
0 files changed, 0 insertions, 0 deletions