summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-09-08 16:35:39 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-09-08 16:35:39 +0000
commit84f7a2133c4d553a234165bb8cbfaf70681bb028 (patch)
tree53d08c1ffc275a4e1d62d7f48ea81172a5919051 /AUTHORS
parentae3896cb74d4bc42acaf6fade0d2a57e28045b2a (diff)
[multi-db] Merge trunk to [3737]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS3
1 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index e3db830b74..4d57503bf8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -104,7 +104,6 @@ answer newbie questions, and generally made Django that much better:
mattycakes@gmail.com
Jason McBrayer <http://www.carcosa.net/jason/>
michael.mcewan@gmail.com
- mir@noris.de
mmarshall
Eric Moritz <http://eric.themoritzfamily.com/>
Robin Munn <http://www.geekforgod.com/>
@@ -121,12 +120,14 @@ answer newbie questions, and generally made Django that much better:
plisk
Daniel Poelzleithner <http://poelzi.org/>
J. Rademaker
+ Michael Radziej <mir@noris.de>
Brian Ray <http://brianray.chipy.org/>
rhettg@gmail.com
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
David Schein
Pete Shinners <pete@shinners.org>
+ SmileyChris <smileychris@gmail.com>
sopel
Thomas Steinacher <tom@eggdrop.ch>
Radek Švarz <http://www.svarz.cz/translate/>