From 7cf6fd8d61ed9ea8bc74ea02c96db041859e8c09 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 31 Jul 2009 18:31:55 +0000 Subject: [PATCH] [soc2009/multidb] Resolved a strange merge conflict. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11374 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/internals/committers.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index c988de7a57..69736ce880 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -177,19 +177,6 @@ Justin Bronn .. _GeoDjango: http://geodjango.org/ -Justin Bronn - Justin Bronn is a computer scientist and attorney specializing - in legal topics related to intellectual property and spatial law. - - In 2007, Justin began developing ``django.contrib.gis`` in a branch, - a.k.a. GeoDjango_, which was merged in time for Django 1.0. While - implementing GeoDjango, Justin obtained a deep knowledge of Django's - internals including the ORM, the admin, and Oracle support. - - Justin lives in Houston, Texas. - -.. _GeoDjango: http://geodjango.org/ - Karen Tracey Karen has a background in distributed operating systems (graduate school), communications software (industry) and crossword puzzle construction