diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-02-28 16:58:24 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-02-28 16:58:24 +0100 |
| commit | cb87920ba9c2871630ff37af6f0131fb1968dc95 (patch) | |
| tree | d5e6e18f7b4cdfd184bb18be417b137ff3ad8538 /AUTHORS | |
| parent | 0c1e7b53d0a33e112107f5387fbde9b2d688fb52 (diff) | |
| parent | d87904286024f5ceb6a2d0d5f17e919c775830a0 (diff) | |
| download | node-cb87920ba9c2871630ff37af6f0131fb1968dc95.tar.gz | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
AUTHORS
ChangeLog
deps/uv/src/unix/pipe.c
lib/http.js
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -415,3 +415,4 @@ Andy Burke <aburke@bitflood.org> Sugendran Ganess <sugendran@sugendran.net> Jim Schubert <james.schubert@gmail.com> Victor Costan <costan@gmail.com> +Timothy J Fontaine <tjfontaine@gmail.com> |