]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
projects / people / stevee / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bcf28f 55625ae)
Merge remote-tracking branch 'maniacikarus/iptables'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Nov 2011 21:28:41 +0000 (22:28 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 23 Nov 2011 21:28:41 +0000 (22:28 +0100)

Trivial merge
Stefan's tree of IPFire 3.x.