[pypy-commit] pypy.org extradoc: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: extradoc
Changeset: r471:0de1b2f3e8b5
Date: 2014-01-11 14:59 -0800
http://bitbucket.org/pypy/pypy.org/changeset/0de1b2f3e8b5/

Log:	merged upstream

diff --git a/people.html b/people.html
--- a/people.html
+++ b/people.html
@@ -48,7 +48,7 @@
 <div class="section" id="armin-rigo">
 <h1>Armin Rigo</h1>
 <img alt="image/people/arigo.png" src="image/people/arigo.png" />
-<p>Armin Rigo is a researcher at the Heinrich-Heine Universitat
+<p>Armin Rigo is a former researcher at the Heinrich-Heine Universitat
 Dusseldorf (Germany).  He studied Mathematics at the University
 of Lausanne (Switzerland), obtained his Ph.D. in Logic and Set
 Theory at the Free University of Brussels (Belgium) in 2002, and
diff --git a/source/people.txt b/source/people.txt
--- a/source/people.txt
+++ b/source/people.txt
@@ -8,7 +8,7 @@
 
 .. image:: image/people/arigo.png
 
-Armin Rigo is a researcher at the Heinrich-Heine Universitat
+Armin Rigo is a former researcher at the Heinrich-Heine Universitat
 Dusseldorf (Germany).  He studied Mathematics at the University
 of Lausanne (Switzerland), obtained his Ph.D. in Logic and Set
 Theory at the Free University of Brussels (Belgium) in 2002, and