From: Michael Tremer Date: Tue, 2 Dec 2014 22:57:35 +0000 (+0100) Subject: Merge remote-tracking branch 'mfischer/squid' into next X-Git-Tag: v2.17-core89~83^2~29 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=bf9a16a4212fb179b3026e5b8eb90a56fda53cd8 Merge remote-tracking branch 'mfischer/squid' into next --- bf9a16a4212fb179b3026e5b8eb90a56fda53cd8