From 42b8682a518e368869e86f01c4ff58978b98f0dd Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Fri, 19 Apr 2013 08:32:24 -0700
Subject: [PATCH 1/2] test: fix dgram-bind-default-address on osx

Allow the IPv4-mapped-as-IPv6 style address.
---
 test/simple/test-dgram-bind-default-address.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/simple/test-dgram-bind-default-address.js b/test/simple/test-dgram-bind-default-address.js
index 96ffa07ae3..ae1b472a08 100644
--- a/test/simple/test-dgram-bind-default-address.js
+++ b/test/simple/test-dgram-bind-default-address.js
@@ -31,6 +31,9 @@ dgram.createSocket('udp4').bind(common.PORT + 0, common.mustCall(function() {
 
 dgram.createSocket('udp6').bind(common.PORT + 1, common.mustCall(function() {
   assert.equal(this.address().port, common.PORT + 1);
-  assert.equal(this.address().address, '::');
+  var address = this.address().address;
+  if (address === '::ffff:0.0.0.0')
+    address = '::';
+  assert.equal(address, '::');
   this.close();
 }));

From 4babd2b46ebf9fbea2c9946af5cfae25a33b2b22 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Fri, 19 Apr 2013 07:39:44 -0700
Subject: [PATCH 2/2] 2013.04.19, Version 0.11.1 (Unstable)

* V8: upgrade to 3.18.0

* uv: Upgrade to v0.11.1

* http: split into multiple separate modules (Timothy J Fontaine)

* http: escape unsafe characters in request path (Ben Noordhuis)

* url: Escape all unwise characters (isaacs)

* build: depend on v8 postmortem-metadata if enabled (Paddy Byers)

* etw: update prototypes to match dtrace provider (Timothy J Fontaine)

* buffer: change output of Buffer.prototype.toJSON() (David Braun)

* dtrace: actually use the _handle.fd value (Timothy J Fontaine)

* dtrace: pass more arguments to probes (Dave Pacheco)

* build: allow building with dtrace on osx (Dave Pacheco)

* zlib: allow passing options to convenience methods (Kyle Robinson Young)
---
 AUTHORS            |  5 +++++
 ChangeLog          | 29 ++++++++++++++++++++++++++++-
 src/node_version.h |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e226243c9f..83278b43bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -439,3 +439,8 @@ Michael Hart <michael.hart.au@gmail.com>
 Andrew Hart <hartandrewr@gmail.com>
 Rafael Garcia <rgarcia2009@gmail.com>
 Tobias Müllerleile <tobias@muellerleile.net>
+David Braun <NodeJS-box@snkmail.com>
+Stanislav Ochotnicky <sochotnicky@redhat.com>
+Ryan Graham <r.m.graham@gmail.com>
+Kelly Gerber <kellygerber22@yahoo.com>
+Ryan Doenges <rhdoenges@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index b01156ef6a..db357dad04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,31 @@
-2013.03.28, Version 0.11.0 (Unstable)
+2013.04.19, Version 0.11.1 (Unstable)
+
+* V8: upgrade to 3.18.0
+
+* uv: Upgrade to v0.11.1
+
+* http: split into multiple separate modules (Timothy J Fontaine)
+
+* http: escape unsafe characters in request path (Ben Noordhuis)
+
+* url: Escape all unwise characters (isaacs)
+
+* build: depend on v8 postmortem-metadata if enabled (Paddy Byers)
+
+* etw: update prototypes to match dtrace provider (Timothy J Fontaine)
+
+* buffer: change output of Buffer.prototype.toJSON() (David Braun)
+
+* dtrace: actually use the _handle.fd value (Timothy J Fontaine)
+
+* dtrace: pass more arguments to probes (Dave Pacheco)
+
+* build: allow building with dtrace on osx (Dave Pacheco)
+
+* zlib: allow passing options to convenience methods (Kyle Robinson Young)
+
+
+2013.03.28, Version 0.11.0 (Unstable), bce38b3d74e64fcb7d04a2dd551151da6168cdc5
 
 * V8: update to 3.17.13
 
diff --git a/src/node_version.h b/src/node_version.h
index 593fb9ddbd..b2832f07b5 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 11
 #define NODE_PATCH_VERSION 1
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""