diff options
| author | isaacs <i@izs.me> | 2013-04-05 09:02:48 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-04-05 09:02:48 -0700 |
| commit | 2c9a38d059d5c744dd111f3a9bc1f850b0d6a078 (patch) | |
| tree | c50b6bbef7281257dc3894ad136d762cb5d4aebb /AUTHORS | |
| parent | b9655fc75813fe452998cd41162bcac5dbceba25 (diff) | |
| parent | 58f93ffc4a23aa7240808288acf8cf9f3022abea (diff) | |
| download | node-new-2c9a38d059d5c744dd111f3a9bc1f850b0d6a078.tar.gz | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
AUTHORS
ChangeLog
deps/v8/src/json-parser.h
lib/crypto.js
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -434,3 +434,6 @@ Benjamin Ruston <benjy.ruston@gmail.com> Manav Rathi <manav.r@directi.com> Marcin Kostrzewa <marcinkostrzewa@yahoo.com> Suwon Chae <doortts@gmail.com> +Mitar Milutinovic <mitar.git@tnode.com> +Michael Hart <michael.hart.au@gmail.com> +Andrew Hart <hartandrewr@gmail.com> |