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)
commit523b5d1afa51d31a6f99e07c54bdd17844acef51
treee4c1536dc1b98d870be0a7f89bb5d58acd4f390d
parentd773e8dd788c69e25c1a7927a55680b34ab6e13e
parent517d02ab1ea53f1a5a531cc80f4ad545eac87e79
Merge remote-tracking branch 'stevee/squid-fast-shutdown' into next