Author: kmtracey
Date: 2008-11-13 17:53:52 -0600 (Thu, 13 Nov 2008)
New Revision: 9417

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/AUTHORS
   django/branches/releases/1.0.X/docs/internals/committers.txt
Log:
[1.0.X] Updated svnmerge metadata and added myself to committers (r9416 from 
trunk).



Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9403,9411
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9416

Modified: django/branches/releases/1.0.X/AUTHORS
===================================================================
--- django/branches/releases/1.0.X/AUTHORS      2008-11-13 23:43:25 UTC (rev 
9416)
+++ django/branches/releases/1.0.X/AUTHORS      2008-11-13 23:53:52 UTC (rev 
9417)
@@ -14,6 +14,7 @@
     * Robert Wittams
     * Gary Wilson
     * Brian Rosner
+    * Karen Tracey
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -394,7 +395,6 @@
     Tom Tobin
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
     [EMAIL PROTECTED]
-    Karen Tracey <[EMAIL PROTECTED]>
     Jeff Triplett <[EMAIL PROTECTED]>
     [EMAIL PROTECTED]
     Makoto Tsuyuki <[EMAIL PROTECTED]>

Modified: django/branches/releases/1.0.X/docs/internals/committers.txt
===================================================================
--- django/branches/releases/1.0.X/docs/internals/committers.txt        
2008-11-13 23:43:25 UTC (rev 9416)
+++ django/branches/releases/1.0.X/docs/internals/committers.txt        
2008-11-13 23:53:52 UTC (rev 9417)
@@ -151,7 +151,17 @@
     In early 2007, Gary started contributing a lot of cleanup fixes and fixing
     broken windows. He's continued to do that necessary tidying up work
     throughout the code base since then.
-    
+
+Karen Tracey
+    Karen has a background in distributed operating systems (graduate school),
+    communications software (industry) and crossword puzzle construction 
+    (freelance).  The last of these brought her to Django, in late 2006, when
+    she set out to put a web front-end on her crossword puzzle database.  
+    That done, she stuck around in the community answering questions, debugging
+    problems, etc. -- because coding puzzles are as much fun as word puzzles.
+
+    Karen lives in Apex, NC, USA.
+
 Specialists
 -----------
 


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to