[pypy-commit] extradoc extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r3978:84a45e78b80d
Date: 2011-12-09 00:25 +0200
http://bitbucket.org/pypy/extradoc/changeset/84a45e78b80d/

Log:	merge