From 6001ba016a3db4701d56abc6d30868d4e5d88dbf Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 9 Aug 2010 21:22:37 +0000
Subject: [soc2010/query-refactor] Merged up to trunk r13556, resolved merge
 conflicts

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 AUTHORS | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 96278827c5..7324a699a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -184,11 +184,13 @@ answer newbie questions, and generally made Django that much better:
     Idan Gazit
     geber@datacollect.com
     Baishampayan Ghose
+    Joshua Ginsberg <jag@flowtheory.net>
     Dimitris Glezos <dimitris@glezos.com>
     glin@seznam.cz
     martin.glueck@gmail.com
     Artyom Gnilov <boobsd@gmail.com>
     Ben Godfrey <http://aftnn.org>
+    Andrew Godwin <andrew@aeracode.org>
     GomoX <gomo@datafull.com>
     Guilherme Mesquita Gondim <semente@taurinus.org>
     Mario Gonzalez <gonzalemario@gmail.com>
@@ -337,6 +339,7 @@ answer newbie questions, and generally made Django that much better:
     Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
     Ramiro Morales <rm0@gmx.net>
     Eric Moritz <http://eric.themoritzfamily.com/>
+    Gregor Müllegger <gregor@muellegger.de>
     Robin Munn <http://www.geekforgod.com/>
     James Murty
     msundstr
-- 
cgit v1.3