[pypy-commit] pypy.org extradoc: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r244:af7cb334b2f9
Date: 2011-08-26 12:06 +0200
http://bitbucket.org/pypy/pypy.org/changeset/af7cb334b2f9/

Log:	merge heads

diff --git a/image/people/holger1.jpg b/image/people/holger1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe73614fea0c884afd444c10f17c9205ebd93736
GIT binary patch

[cut]

diff --git a/people.html b/people.html
--- a/people.html
+++ b/people.html
@@ -131,6 +131,22 @@
 Cognimatics. His contributions to PyPy started 2010 and consists of
 the array module as well as work on the JIT compiler's trace optimizers.</p>
 </div>
+<div class="section" id="holger-krekel">
+<h1>Holger Krekel</h1>
+<img alt="image/people/holger1.jpg" src="image/people/holger1.jpg" />
+<p>Holger Krekel is a founder of the PyPy project and has participated in
+PyPy core developement for several years as well as maintained much of
+its infrastructure.  He also is the author of the popular <a class="reference external" href="http://pytest.org">py.test</a> and
+<a class="reference external" href="http://codespeak.net/tox">tox</a> testing tools as well as <a class="reference external" href="http://codespeak.net/execnet">execnet</a>, a library for easily deploying
+different interacting Python interpreters side by side.  He helped
+manage multiple PyPy funding contracts through his company merlinux and is a
+PyPy representative within the Software Freedom Conservancy (SFC).  He
+holds a summa cum laude degree in computer science with a thesis about
+artificial intelligence applied to the game of Go.  As of 2011 he is on
+another sabbatical-ish leave, caring for his newborn son, travelling
+and pondering what comes next.  Other than that he continues to care
+for testing and some PyPy co-ordination bits behind the scene.</p>
+</div>
 <div class="section" id="many-more-people">
 <h1>Many more people</h1>
 <p>PyPy is and has always been an effort of many volunteers. Consult the <a class="reference external" href="https://bitbucket.org/pypy/pypy/src/tip/LICENSE">LICENSE</a>
diff --git a/source/people.txt b/source/people.txt
--- a/source/people.txt
+++ b/source/people.txt
@@ -107,6 +107,27 @@
 Cognimatics. His contributions to PyPy started 2010 and consists of 
 the array module as well as work on the JIT compiler's trace optimizers.
 
+Holger Krekel
+==================
+
+.. image:: image/people/holger1.jpg
+
+Holger Krekel is a founder of the PyPy project and has participated in
+PyPy core developement for several years as well as maintained much of
+its infrastructure.  He also is the author of the popular `py.test`_ and
+`tox`_ testing tools as well as execnet_, a library for easily deploying
+different interacting Python interpreters side by side.  He helped
+manage multiple PyPy funding contracts through his company merlinux and is a
+PyPy representative within the Software Freedom Conservancy (SFC).  He
+holds a summa cum laude degree in computer science with a thesis about
+artificial intelligence applied to the game of Go.  As of 2011 he is on
+another sabbatical-ish leave, caring for his newborn son, travelling
+and pondering what comes next.  Other than that he continues to care 
+for testing and some PyPy co-ordination bits behind the scene.
+
+.. _`py.test`: http://pytest.org
+.. _`tox`: http://codespeak.net/tox
+.. _`execnet`: http://codespeak.net/execnet
 
 Many more people
 ================