From 6f92da2dd106b0c63fde563284f83e08e2a521b5 Mon Sep 17 00:00:00 2001
From: Timothy J Fontaine <tjfontaine@gmail.com>
Date: Tue, 6 Aug 2013 14:41:21 -0700
Subject: [PATCH] 2013.08.06, Version 0.11.5 (Unstable)

* v8: upgrade to 3.20.11

* uv: upgrade to v0.11.7

* buffer: return offset for end of last write (Trevor Norris)

* build: embed the mdb_v8.so into the binary (Timothy J Fontaine)

* build: fix --without-ssl build (Ben Noordhuis)

* child_process: add 'shell' option to .exec() (Ben Noordhuis)

* dgram: report send errors to cb, don't pass bytes (Ben Noordhuis)

* fs: write strings directly to disk (Trevor Norris)

* https: fix default port (Koichi Kobayashi)

* openssl: use asm for sha, md5, rmd (Fedor Indutny)

* os: add mac address to networkInterfaces() output (Brian White)

* smalloc: introduce smalloc module (Trevor Norris)

* stream: Simplify flowing, passive data listening (streams3) (isaacs)

* tls: asynchronous SNICallback (Fedor Indutny)

* tls: share tls tickets key between cluster workers (Fedor Indutny)

* util: don't throw on circular %j input to format() (Ben Noordhuis)
---
 AUTHORS            |  8 ++++++++
 ChangeLog          | 37 ++++++++++++++++++++++++++++++++++++-
 src/node_version.h |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4b7f00c721a0e6..d6dd6cfb8b87ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -466,3 +466,11 @@ Krzysztof Chrapka <chrapka.k@gmail.com>
 Linus Mårtensson <linus.martensson@sonymobile.com>
 Peter Rust <peter@cornerstonenw.com>
 Shuan Wang <shuanwang@gmail.com>
+Wyatt Preul <wpreul@gmail.com>
+David Björklund <david.bjorklund@gmail.com>
+Dav Glass <davglass@gmail.com>
+Andrew Chilton <andychilton@gmail.com>
+Antony Bailey <support@antonybailey.net>
+Forrest L Norvell <ogd@aoaioxxysz.net>
+Evan Solomon <evan@evanalyze.com>
+Eran Hammer <eran@hueniverse.com>
diff --git a/ChangeLog b/ChangeLog
index 02849a9b983a63..8e4ee85aaad1e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,39 @@
-2013.07.12, Version 0.11.4 (Unstable)
+2013.08.06, Version 0.11.5 (Unstable)
+
+* v8: upgrade to 3.20.11
+
+* uv: upgrade to v0.11.7
+
+* buffer: return offset for end of last write (Trevor Norris)
+
+* build: embed the mdb_v8.so into the binary (Timothy J Fontaine)
+
+* build: fix --without-ssl build (Ben Noordhuis)
+
+* child_process: add 'shell' option to .exec() (Ben Noordhuis)
+
+* dgram: report send errors to cb, don't pass bytes (Ben Noordhuis)
+
+* fs: write strings directly to disk (Trevor Norris)
+
+* https: fix default port (Koichi Kobayashi)
+
+* openssl: use asm for sha, md5, rmd (Fedor Indutny)
+
+* os: add mac address to networkInterfaces() output (Brian White)
+
+* smalloc: introduce smalloc module (Trevor Norris)
+
+* stream: Simplify flowing, passive data listening (streams3) (isaacs)
+
+* tls: asynchronous SNICallback (Fedor Indutny)
+
+* tls: share tls tickets key between cluster workers (Fedor Indutny)
+
+* util: don't throw on circular %j input to format() (Ben Noordhuis)
+
+
+2013.07.12, Version 0.11.4 (Unstable), b5b84197ed037918fd1a26e5cb87cce7c812ca55
 
 * npm: Upgrade to 1.3.4
 
diff --git a/src/node_version.h b/src/node_version.h
index cf3d6c07b777ff..17474405c25d35 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 11
 #define NODE_PATCH_VERSION 5
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""