[squid/f14/master: 9/12] 3.1.9

[Henrik Nordström]

commit cb5a2e912ad3fb43a0315b22052049d5ee6f7cea
Merge: ee3c984 926877c
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Oct 25 20:19:22 2010 +0200

    3.1.9

 squid.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --cc squid.spec
index 42427e3,52609fe..4f4e3c2
--- a/squid.spec
+++ b/squid.spec
@@@ -259,11 -259,10 +259,10 @@@ f
      chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
  
  %changelog
- <<<<<<< HEAD
- * Mon Oct 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 3.1.9-1
+ * Mon Oct 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 3.1.9-2
  - Upstream 3.1.8 bugfix release
  
 -* Wed Oct 13 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.8-2
 +* Mon Oct 18 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.8-2
  - fixes #584161 - squid userid not added to wbpriv group
  
  * Sun Sep 05 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.8-1