diff options
author | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
commit | bf16d9280ea7aadce5c5437184c1d80e651a997a (patch) | |
tree | 85c570a9c80181c9bd84ce8bcc726d644daa36db /AUTHORS | |
parent | 4822d780bb913c9ef7c2301a181a5834887cddb4 (diff) | |
parent | 24184345688e1f545ffc87e5742de06ed9855007 (diff) | |
download | node-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz |
Merge branch 'v0.8'
Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -356,3 +356,4 @@ Eugen Dueck <eugen@dueck.org> Gil Pedersen <git@gpost.dk> Tyler Neylon <tylerneylon@gmail.com> Golo Roden <webmaster@goloroden.de> +Ron Korving <rkorving@wizcorp.jp> |