Merge branch 'v0.10.11-release' into v0.10

3 files changed, 21 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index dc1f54726..f9eabfd18 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -453,3 +453,4 @@ Nathan Zadoks <nathan@nathan7.eu>
 Rafael Henrique Moreira <rafadev7@gmail.com>
 Daniel G. Taylor <dan@programmer-art.org>
 Kiyoshi Nomo <tokyoincidents.g@gmail.com>
+Veres Lajos <vlajos@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 25410aaf7..573fde36e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,22 @@
-2013.06.04, Version 0.10.10 (Stable)
+2013.06.13, Version 0.10.11 (Stable)
+
+* uv: upgrade to 0.10.11
+
+* npm: Upgrade to 1.2.30
+
+* openssl: add missing configuration pieces for MIPS (Andrei Sedoi)
+
+* Revert "http: remove bodyHead from 'upgrade' events" (isaacs)
+
+* v8: fix pointer arithmetic undefined behavior (Trevor Norris)
+
+* crypto: fix utf8/utf-8 encoding check (Ben Noordhuis)
+
+* net: Fix busy loop on POLLERR|POLLHUP on older linux kernels (Ben Noordhuis, isaacs)
+
+
+
+2013.06.04, Version 0.10.10 (Stable), 25e51c396aa23018603baae2b1d9390f5d9db496
 
 * uv: Upgrade to 0.10.10
 
diff --git a/src/node_version.h b/src/node_version.h
index 5490e9d0c..ee36be95c 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 10
 #define NODE_PATCH_VERSION 11
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""