]> 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: b146f40 777cf2a)
Merge remote-tracking branch 'maniacikarus/iptables'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 Jan 2012 11:59:02 +0000 (12:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 21 Jan 2012 11:59:02 +0000 (12:59 +0100)

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