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