summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2012-08-17 13:05:20 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2012-08-17 13:05:20 +0200
commita177f55b0c022b5a77e9660beea5e190bc4c6e88 (patch)
tree969156e456a55ad3470a64fb3bca1806c8020463 /AUTHORS
parent90ea68107a94b33e6b20cd9c2af8547b8c41da7c (diff)
parent9918e5d4f6fbc8fe63d0395170a2daef2484d17a (diff)
downloadnode-new-a177f55b0c022b5a77e9660beea5e190bc4c6e88.tar.gz
Merge remote-tracking branch 'origin/v0.8'
Conflicts: ChangeLog src/node_version.h test/message/stdin_messages.out tools/install.py
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index d5188b3cbf..429c761add 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -354,3 +354,5 @@ Pavel Lang <langpavel@phpskelet.org>
Peter Rybin <peter.rybin@gmail.com>
Eugen Dueck <eugen@dueck.org>
Gil Pedersen <git@gpost.dk>
+Tyler Neylon <tylerneylon@gmail.com>
+Golo Roden <webmaster@goloroden.de>