From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 4 Jul 2011 04:34:37 +0000 (-0600)
Subject: prep for 3.1.14
X-Git-Tag: take08~55^2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04f5e27a25bbf06af5da248b4d7536cfa2a55a35;p=thirdparty%2Fsquid.git

prep for 3.1.14
---

diff --git a/ChangeLog b/ChangeLog
index 14cf7a7c2d..910086856a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -196,6 +196,10 @@ Changes to squid-3.2.0.1 (03 Aug 2010):
 	- ... and a great many testing improvements
 	- ... and many documentation updates
 
+Changes to squid-3.1.14 (04 Jul 2011):
+
+	- Regression Bug 3261: Could not create a DNS socket and exit
+
 Changes to squid-3.1.13 (01 Jul 2011):
 
 	- Regression Bug 3239: problems with myip/myport upgrade
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 6bcca49bc6..2ca8b65613 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.13 release notes</title>
+<title>Squid 3.1.14 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.1.13
+The Squid Team are pleased to announce the release of Squid-3.1.14
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.