From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/squid/files/squid.conf.default |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/components/squid/squid.conf.default b/components/squid/files/squid.conf.default
similarity index 100%
rename from components/squid/squid.conf.default
rename to components/squid/files/squid.conf.default

--
Gitblit v1.9.3