Merge branch 'v0.6'
authorFedor Indutny <fedor.indutny@gmail.com>
Wed, 11 Jan 2012 20:17:44 +0000 (02:17 +0600)
committerFedor Indutny <fedor.indutny@gmail.com>
Wed, 11 Jan 2012 20:17:44 +0000 (02:17 +0600)
commit9e6957b0a55e7ef8cd2a2efc066555da8d781355
tree4e9835aca02883f3303623dd6c80cb55231cdc3e
parent8abb73ef58ccb6fd1b8cc4266c9981ce6574c78f
parent07701e7cc85feaeaa0a2a6c8146b0cb3eefc12fe
Merge branch 'v0.6'

Conflicts:
src/handle_wrap.cc
src/node_zlib.cc
src/process_wrap.cc
Makefile
src/handle_wrap.cc
src/node_zlib.cc
src/process_wrap.cc
src/stream_wrap.cc