diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-08-09 21:22:37 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-08-09 21:22:37 +0000 |
| commit | 6001ba016a3db4701d56abc6d30868d4e5d88dbf (patch) | |
| tree | 7a42c57d802484300c2384d3cd3a968de1804383 /AUTHORS | |
| parent | c7bd48cb9f645e5ff07d1e68b86130e3bb2b043f (diff) | |
[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflictsarchive/soc2010/query-refactor
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 |