[squid/f13/master: 8/12] 3.1.9

[Henrik Nordström]

commit 500cde1b99ebbb9ea127cfcb81a89c7cde338645
Merge: ec227d2 9cf1c8d
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Oct 25 20:21:14 2010 +0200

    3.1.9

 squid.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc squid.spec
index c892d4d,43acef8..3b544a2
--- a/squid.spec
+++ b/squid.spec
@@@ -3,8 -3,8 +3,13 @@@
  ## % define __find_requires %{SOURCE99}
  
  Name:     squid
++<<<<<<< HEAD
 +Version:  3.1.9
 +Release:  1%{?dist}
++=======
+ Version:  3.1.8
+ Release:  2%{?dist}
++>>>>>>> 9cf1c8d963e567e95c4beabf7b3430fba00fa7c5
  Summary:  The Squid proxy caching server
  Epoch:    7
  License:  GPLv2