Merge contributors-6614

Author: exarkun Reviewer: glyph Fixes: twisted#6614 Add some people who have contributed recently to the list of contributors. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41317 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
boxed · Jan 18, 2014 · 160a41a · 160a41a
1 parent becf8f9
commit 160a41a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/LICENSE b/LICENSE
@@ -4,6 +4,7 @@ Andy Gayton
 Andrew Bennetts
 Antoine Pitrou
 Apple Computer, Inc.
+Ashwini Oruganti
 Benjamin Bruheim
 Bob Ippolito
 Canonical Limited
@@ -13,6 +14,7 @@ Donovan Preston
 Eric Mangold
 Eyal Lotem
 Google Inc.
+Hynek Schlawack
 Itamar Turner-Trauring
 James Knight
 Jason A. Mobarak
@@ -22,6 +24,7 @@ Jonathan Jacobs
 Jonathan Lange
 Jonathan D. Simms
 Jürgen Hermann
+Julian Berman
 Kevin Horn
 Kevin Turner
 Laurens Van Houtven
@@ -32,12 +35,14 @@ Moshe Zadka
 Paul Swartz
 Pavel Pergamenshchik
 Ralph Meijer
+Richard Wall
 Sean Riley
 Software Freedom Conservancy
 Travis B. Hartwell
 Thijs Triemstra
 Thomas Herve
 Timothy Allen
+Tom Prince
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/twisted/topfiles/6614.misc b/twisted/topfiles/6614.misc