From 9313fdc71ca8335d5e3a391c103230ee6219b3e2 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Fri, 11 Jan 2013 10:49:21 -0800
Subject: [PATCH] 2013.01.11, Version 0.9.6 (Unstable)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* V8: update to 3.15.11.5

* node: remove ev-emul.h (Ben Noordhuis)

* path: make basename and extname ignore trailing slashes (Bert Belder)

* typed arrays: fix sunos signed/unsigned char issue (Ben Noordhuis)

* child_process: Fix {stdio:'inherit'} regression (Ben Noordhuis)

* child_process: Fix pipe() from child stdio streams  (Maciej Małecki)

* child_process: make fork() execPath configurable (Bradley Meck)

* stream: Add readable.push(chunk) method (isaacs)

* dtrace: x64 ustack helper (Fedor Indutny)

* repl: fix floating point number parsing (Nirk Niggler)

* repl: allow overriding builtins (Ben Noordhuis)

* net: add localAddress and localPort to Socket (James Hight)

* fs: make pool size coincide with ReadStream bufferSize (Shigeki Ohtsu)

* typed arrays: implement load and store swizzling (Dean McNamee)

* windows: fix perfctr crash on XP and 2003 (Scott Blomquist)

* dgram: fix double implicit bind error (Ben Noordhuis)
---
 AUTHORS            |  3 +++
 ChangeLog          | 36 ++++++++++++++++++++++++++++++++++++
 src/node_version.h |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index c2d23b9c2b3..eb558aa9f71 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -398,3 +398,6 @@ Chad Rhyner <chadrhyner@gmail.com>
 Ben Taber <ben.taber@gmail.com>
 Luke Arduini <luke.arduini@me.com>
 Luke Bayes <lbayes@patternpark.com>
+Nirk Niggler <nirk.niggler@gmail.com>
+James Hight <james@zavoo.com>
+Mike Harsch <mike@harschsystems.com>
diff --git a/ChangeLog b/ChangeLog
index 33076aa9e1d..d4805dc43e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2013.01.11, Version 0.9.6 (Unstable)
+
+* V8: update to 3.15.11.5
+
+* node: remove ev-emul.h (Ben Noordhuis)
+
+* path: make basename and extname ignore trailing slashes (Bert Belder)
+
+* typed arrays: fix sunos signed/unsigned char issue (Ben Noordhuis)
+
+* child_process: Fix {stdio:'inherit'} regression (Ben Noordhuis)
+
+* child_process: Fix pipe() from child stdio streams  (Maciej Małecki)
+
+* child_process: make fork() execPath configurable (Bradley Meck)
+
+* stream: Add readable.push(chunk) method (isaacs)
+
+* dtrace: x64 ustack helper (Fedor Indutny)
+
+* repl: fix floating point number parsing (Nirk Niggler)
+
+* repl: allow overriding builtins (Ben Noordhuis)
+
+* net: add localAddress and localPort to Socket (James Hight)
+
+* fs: make pool size coincide with ReadStream bufferSize (Shigeki Ohtsu)
+
+* typed arrays: implement load and store swizzling (Dean McNamee)
+
+* windows: fix perfctr crash on XP and 2003 (Scott Blomquist)
+
+* dgram: fix double implicit bind error (Ben Noordhuis)
+
+
+2012.12.30, Version 0.9.5 (Unstable), 01994e8119c24f2284bac0779b32acb49c95bee7
 
 * assert: improve support for new execution contexts (lukebayes)
 
diff --git a/src/node_version.h b/src/node_version.h
index 7b143997078..7dba0c6b127 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -30,7 +30,7 @@
 # define NODE_TAG ""
 #endif
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)