diff options
author | isaacs <i@izs.me> | 2013-01-18 12:58:16 -0800 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-01-18 12:58:16 -0800 |
commit | 3d7818fc42c5f9af2aeccf9d75ad6a2372179f28 (patch) | |
tree | dc768380326c509df5d90616bdfcbfb6d22b6264 /AUTHORS | |
parent | fc3547bc828dfcaca83e9c4415743fb201a821f6 (diff) | |
parent | 9c2c84546347df599840aceb59605b4b6d38a549 (diff) | |
download | node-new-3d7818fc42c5f9af2aeccf9d75ad6a2372179f28.tar.gz |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
src/node_version.h
test/simple/test-buffer.js
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -385,6 +385,8 @@ Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp> Nicolas Chambrier <naholyr@gmail.com> Tim Bradshaw <tfb@cley.com> Johannes Ewald <mail@johannesewald.de> +Chris Dent <chris.dent@gmail.com> +Dan Milon <danmilon@gmail.com> Brandon Philips <brandon.philips@rackspace.com> Frederico Silva <frederico.silva@gmail.com> Jan Wynholds <jan@rootmusic.com> |