summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS11
1 files changed, 9 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 87c341cedd..214be6a833 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -122,8 +122,7 @@ Sam Stephenson <sam@37signals.com>
Jorge Chamorro Bieling <jorge@jorgechamorro.com>
Evan Larkin <evan.larkin.il.com>
Sean Coates <sean@seancoates.com>
-Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
-Tom Hughes-Croucher <tom_croucher@yahoo.com>
+Tom Hughes <tom.hughes@palm.com>
Joshua Peek <josh@joshpeek.com>
Nathan Rajlich <nathan@tootallnate.net>
Peteris Krumins <peteris.krumins@gmail.com>
@@ -354,6 +353,7 @@ Pavel Lang <langpavel@phpskelet.org>
Peter Rybin <peter.rybin@gmail.com>
Timothy J Fontaine <tjfontaine@gmail.com>
Joe Andaverde <joe@andaverde.net>
+Tom Hughes-Croucher <tom_croucher@yahoo.com>
Eugen Dueck <eugen@dueck.org>
Gil Pedersen <git@gpost.dk>
Tyler Neylon <tylerneylon@gmail.com>
@@ -674,5 +674,12 @@ Cydox <farr.janhendrik@aol.de>
Steven Rockarts <srockarts@invidi.com>
Vladimir Guguiev <wizardzloy@gmail.com>
Yosuke Furukawa <yosuke.furukawa@gmail.com>
+Tiago Ribeiro <tiago.ribeiro@gmail.com>
+Rui Marinho <rpm@seegno.com>
+Jesse cogollo <cogollo87@gmail.com>
+Chris Alley <chris@chrisalley.info>
+Michal Tehnik <michal.tehnik@mictech.cz>
+Aaron Bieber <deftly@gmail.com>
+Phil Hughes <me@iamphill.com>
# Generated by tools/update-authors.sh