mirror of
https://github.com/django/django.git
synced 2025-10-24 22:26:08 +00:00
[soc2009/multidb] Merged up to trunk r11756.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -148,7 +148,6 @@ Joseph Kocherhans
|
||||
|
||||
.. _brian rosner: http://oebfare.com/
|
||||
.. _eldarion: http://eldarion.com/
|
||||
.. _pinax: http://pinaxproject.com/
|
||||
.. _django dose: http://djangodose.com/
|
||||
|
||||
`Gary Wilson`_
|
||||
@@ -189,6 +188,31 @@ Karen Tracey
|
||||
|
||||
Karen lives in Apex, NC, USA.
|
||||
|
||||
`Jannis Leidel`_
|
||||
Jannis graduated in media design from `Bauhaus-University Weimar`_,
|
||||
is the author of a number of pluggable Django apps and likes to
|
||||
contribute to Open Source projects like Pinax_. He currently works as
|
||||
a freelance web developer and designer.
|
||||
|
||||
Jannis lives in Berlin, Germany.
|
||||
|
||||
.. _Jannis Leidel: http://jezdez.com/
|
||||
.. _Bauhaus-University Weimar: http://www.uni-weimar.de/
|
||||
.. _pinax: http://pinaxproject.com/
|
||||
|
||||
`James Tauber`_
|
||||
James is the lead developer of Pinax_ and the CEO and founder of
|
||||
Eldarion_. He has been doing open source software since 1993, Python
|
||||
since 1998 and Django since 2006. He serves on the board of the Python
|
||||
Software Foundation and is currently on a leave of absence from a PhD in
|
||||
linguistics.
|
||||
|
||||
James currently lives in Boston, MA, USA but originally hails from
|
||||
Perth, Western Australia where he attended the same high school as
|
||||
Russell Keith-Magee.
|
||||
|
||||
.. _James Tauber: http://jtauber.com/
|
||||
|
||||
Specialists
|
||||
-----------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user