summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-04-12 10:38:15 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-04-12 10:38:15 -0400
commitbb77763d665b113be0793dc1ecbb620dd9c38384 (patch)
treec909c0fd7cc1899d7a6ced27cf32a7ca4568c2c2 /Authors
parent7ef28c854fa386ee1aa64aaa22c3ef026094f40a (diff)
parentaebcd4abd574b2edb8f2919cb4c2a77617eb97e9 (diff)
Merged trunk.
Diffstat (limited to 'Authors')
-rw-r--r--Authors1
1 files changed, 1 insertions, 0 deletions
diff --git a/Authors b/Authors
index 48b912184..2de4fb955 100644
--- a/Authors
+++ b/Authors
@@ -31,6 +31,7 @@ Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com>
Joe Heck <heckj@mac.com>
Joel Moore <joelbm24@gmail.com>
+Johannes Erdfelt <johannes.erdfelt@rackspace.com>
John Dewey <john@dewey.ws>
John Tran <jtran@attinteractive.com>
Jonathan Bryce <jbryce@jbryce.com>