[pypy-commit] pypy.org extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r389:f656fe4becde
Date: 2013-04-07 10:35 +0200
http://bitbucket.org/pypy/pypy.org/changeset/f656fe4becde/

Log:	merge