summaryrefslogtreecommitdiff
path: root/docs/internals/committers.txt
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2013-06-19 12:03:20 +0100
committerAndrew Godwin <andrew@aeracode.org>2013-06-19 12:05:23 +0100
commit9daf81b94e7945d7adfdf62206cf9cb436166f0d (patch)
tree0ca2a77977432d0c139886297afb433569b588ca /docs/internals/committers.txt
parent315ab41e416c777d4f42932d42df07872e8f8895 (diff)
parentd9a43545be1af95a13c181c8b178f5631d3a4148 (diff)
Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts: django/db/models/loading.py
Diffstat (limited to 'docs/internals/committers.txt')
-rw-r--r--docs/internals/committers.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index b56c8e469b..6732f1561f 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -526,6 +526,17 @@ Marc Tamlyn
.. _CCBV: http://ccbv.co.uk/
.. _Incuna Ltd: http://incuna.com/
+Baptiste Mispelon
+ Baptiste discovered Django around the 1.2 version and promptly switched away
+ from his homegrown PHP framework. He started getting more involved in the
+ project after attending DjangoCon EU 2012, mostly by triaging tickets and
+ submitting small patches.
+
+ Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_,
+ a small French company providing services to architects.
+
+.. _M2BPO: http://www.m2bpo.fr
+
Developers Emeritus
===================