]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d63c8b6 3731388)
Merge remote branch 'maniacikarus/fail2ban' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Oct 2010 07:08:48 +0000 (09:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Oct 2010 07:08:48 +0000 (09:08 +0200)

Trivial merge
IPFire 3.x development tree