Merge remote-tracking branch 'mfischer/squid' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:57:35 +0000 (23:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:57:35 +0000 (23:57 +0100)
commitbf9a16a4212fb179b3026e5b8eb90a56fda53cd8
tree39e90543594c19472952c398c1e60e22504dd675
parent7edd993d2573535d24f39dcfcd2977b355ffe4d3
parentbc3dd1e975d420cc54d2d2dce831d13e2a9ccad3
Merge remote-tracking branch 'mfischer/squid' into next