diff options
| author | isaacs <i@izs.me> | 2013-01-11 22:18:07 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-01-11 22:18:07 +0400 |
| commit | 97db62b4d9f7de385ccbcddb70ae048b050f5c24 (patch) | |
| tree | b229a05031c68d0b2f087d6bccebf65d85b80f1d /AUTHORS | |
| parent | 6a91eab0970a87431743c79ecb8e3efaed1796d9 (diff) | |
| parent | 4fa3fd1cc0eb5a63d8b3644af5b4dc2d6cc0cc86 (diff) | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
Makefile
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -382,6 +382,9 @@ Olivier Lalonde <olalonde@gmail.com> Francois Marier <francois@mozilla.com> Trevor Norris <trev.norris@gmail.com> Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp> +Nicolas Chambrier <naholyr@gmail.com> +Tim Bradshaw <tfb@cley.com> +Johannes Ewald <mail@johannesewald.de> Brandon Philips <brandon.philips@rackspace.com> Frederico Silva <frederico.silva@gmail.com> Jan Wynholds <jan@rootmusic.com> @@ -392,7 +395,6 @@ Sergey Kholodilov <serghol@gmail.com> Tim Kuijsten <tim@netsend.nl> Michael Axiak <mike@axiak.net> Chad Rhyner <chadrhyner@gmail.com> -Nicolas Chambrier <naholyr@gmail.com> Ben Taber <ben.taber@gmail.com> Luke Arduini <luke.arduini@me.com> Luke Bayes <lbayes@patternpark.com> |