[squid] Correct release after merge conflict

[Henrik Nordström]

commit 144e99dcf97b686e4ab61805fc2692724facfb6e
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Tue Jan 17 20:26:58 2012 +0100

    Correct release after merge conflict

 squid.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/squid.spec b/squid.spec
index e05405e..a218c8e 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.0.14
-Release:  5%{?dist}
+Release:  6%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -316,7 +316,7 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
-* Tue Jan 17 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.2.0.14-4
+* Tue Jan 17 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.2.0.14-6
 - upstream gcc-4.7 patch
 - fix for bug #772483 running out of memory, mem_node growing out of bounds