From 2acd544cff7142e06aa3b09ec64b4a33dd9ab996 Mon Sep 17 00:00:00 2001
From: Timothy J Fontaine <tjfontaine@gmail.com>
Date: Thu, 1 May 2014 09:16:45 -0700
Subject: [PATCH] 2014.05.02, Version 0.11.25 (Unstable)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since version 0.11.24:

* osx: pass const handle pointer to uv___stream_fd (Chernyshev
  Viacheslav)

* unix, windows: pass const handle ptr to uv_tcp_get*name (Chernyshev
  Viacheslav)

* common: pass const sockaddr ptr to uv_ip*_name (Chernyshev Viacheslav)

* unix, windows: validate flags on uv_udp|tcp_bind (Saúl Ibarra
  Corretgé)

* unix: handle case when addr is not initialized after recvmsg (Saúl
  Ibarra Corretgé)

* unix, windows: uv_now constness (Rasmus Pedersen)
---
 .mailmap             |  3 ++-
 AUTHORS              |  2 ++
 ChangeLog            | 19 +++++++++++++++++++
 include/uv-version.h |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7d627a3d..533e1019 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,10 +10,11 @@ Fedor Indutny <fedor.indutny@gmail.com> <fedor@indutny.com>
 Frank Denis <github@pureftpd.org>
 Isaac Z. Schlueter <i@izs.me>
 Justin Venus <justin.venus@gmail.com> <justin.venus@orbitz.com>
-Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
 Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
+Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
 Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
 Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
+Rasmus Christian Pedersen <ruysch@outlook.com>
 Rasmus Pedersen <ruysch@outlook.com> <zerhacken@yahoo.com>
 Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
 Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
diff --git a/AUTHORS b/AUTHORS
index eea91d82..cb47cee0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -137,3 +137,5 @@ Javier Hernández <jhernandez@emergya.com>
 Tonis Tiigi <tonistiigi@gmail.com>
 Norio Kobota <nori.0428@gmail.com>
 李港平 <chopdown@gmail.com>
+Chernyshev Viacheslav <astellar@ro.ru>
+Stephen von Takach <steve@advancedcontrol.com.au>
diff --git a/ChangeLog b/ChangeLog
index aa1581bc..907af367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2014.05.02, Version 0.11.25 (Unstable)
+
+Changes since version 0.11.24:
+
+* osx: pass const handle pointer to uv___stream_fd (Chernyshev Viacheslav)
+
+* unix, windows: pass const handle ptr to uv_tcp_get*name (Chernyshev
+  Viacheslav)
+
+* common: pass const sockaddr ptr to uv_ip*_name (Chernyshev Viacheslav)
+
+* unix, windows: validate flags on uv_udp|tcp_bind (Saúl Ibarra Corretgé)
+
+* unix: handle case when addr is not initialized after recvmsg (Saúl Ibarra
+  Corretgé)
+
+* unix, windows: uv_now constness (Rasmus Pedersen)
+
+
 2014.04.15, Version 0.11.24 (Unstable), ed948c29f6e8c290f79325a6f0bc9ef35bcde644
 
 Changes since version 0.11.23:
diff --git a/include/uv-version.h b/include/uv-version.h
index 3deadbf5..bd69f6c9 100644
--- a/include/uv-version.h
+++ b/include/uv-version.h
@@ -33,6 +33,6 @@
 #define UV_VERSION_MAJOR 0
 #define UV_VERSION_MINOR 11
 #define UV_VERSION_PATCH 25
-#define UV_VERSION_IS_RELEASE 0
+#define UV_VERSION_IS_RELEASE 1
 
 #endif /* UV_VERSION_H */