[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r85982:518912cfcdd9
Date: 2016-08-02 10:43 +0200
http://bitbucket.org/pypy/pypy/changeset/518912cfcdd9/

Log:	merge heads

diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-# hypothesis is used for test generation on untranslated jit tests
+# hypothesis is used for test generation on untranslated tests
 hypothesis
 enum34>=1.1.2