]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d773e8d 517d02a)
Merge remote-tracking branch 'stevee/squid-fast-shutdown' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Jun 2013 17:04:12 +0000 (19:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Jun 2013 17:04:12 +0000 (19:04 +0200)

Trivial merge
IPFire 2.x development tree