[pypy-svn] pypy closed-branches: Merge closed head 785ddbf40836 on branch simplify-conftest

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: closed-branches
Changeset: r43961:94cc2dd88bd5
Date: 2011-05-08 17:28 +0200
http://bitbucket.org/pypy/pypy/changeset/94cc2dd88bd5/

Log:	Merge closed head 785ddbf40836 on branch simplify-conftest

diff --git a/.hgsubstate b/.hgsubstate
new file mode 100644