diff options
| author | isaacs <i@izs.me> | 2012-08-03 16:23:14 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-08-03 16:23:14 -0700 |
| commit | 3bf1846bb7653af718d8d5bf4e75d904b2ac285f (patch) | |
| tree | ff06f5873e27750f2e2af37f7019d00f3f9bf814 /AUTHORS | |
| parent | c05f52c254a070f8b58f12b37687d4e40a0edb8e (diff) | |
| parent | 5fdeebd94d58bf715d991d5bc63be6fff507f27d (diff) | |
| download | node-3bf1846bb7653af718d8d5bf4e75d904b2ac285f.tar.gz | |
Merge remote-tracking branch 'ry/v0.8'
Conflicts:
ChangeLog
deps/uv/src/unix/sunos.c
deps/uv/test/test-tcp-unexpected-read.c
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -352,3 +352,5 @@ George Shank <shankga@gmail.com> Mike Morearty <mike@morearty.com> Pavel Lang <langpavel@phpskelet.org> Peter Rybin <peter.rybin@gmail.com> +Eugen Dueck <eugen@dueck.org> +Gil Pedersen <git@gpost.dk> |