------------------------------------------------------------
revno: 12425
revision-id: squid3@treenet.co.nz-20121210071549-i2iszzv4deip304x
parent: squid3@treenet.co.nz-20121202082950-8uazfqo3omancwbx
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Mon 2012-12-10 00:15:49 -0700
message:
  Prep for 3.2.5
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121210071549-i2iszzv4deip304x
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 355d352cb68063689d40726a9deeb6f5cafa9235
# timestamp: 2012-12-10 07:54:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121202082950-\
#   8uazfqo3omancwbx
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2012-12-02 08:29:50 +0000
+++ ChangeLog	2012-12-10 07:15:49 +0000
@@ -23,6 +23,10 @@
 	- ... and many compile error fixes
 	- ... and a very large amount of code polish for faster compilation
 
+Changes to squid-3.2.5 (10 Dec 2012):
+
+	- Bug 3698: Add missing include of errno.h
+
 Changes to squid-3.2.4 (03 Dec 2012):
 
 	- Ported: urllogin ACL from squid 2.7

=== modified file 'doc/release-notes/release-3.2.sgml'
--- doc/release-notes/release-3.2.sgml	2012-12-02 08:29:50 +0000
+++ doc/release-notes/release-3.2.sgml	2012-12-10 07:15:49 +0000
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.2.4 release notes</title>
+<title>Squid 3.2.5 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,8 @@
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.2.4 for testing.
+The Squid Team are pleased to announce the release of Squid-3.2.5 for 
+testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.2/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.