[pypy-commit] pypy release-pypy2.7-v7.x: merge default into release branch

2019-12-07 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-v7.x Changeset: r98253:1c36a847ec09 Date: 2019-12-08 09:00 +0200 http://bitbucket.org/pypy/pypy/changeset/1c36a847ec09/ Log:merge default into release branch diff --git a/lib_pypy/_cffi_ssl/_stdssl/error.py b/lib_pypy/_cffi_ssl/_stdssl/error.py

[pypy-commit] pypy release-pypy2.7-v7.x: merge default into release branch

2019-11-26 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-v7.x Changeset: r98161:c649c1ec74b5 Date: 2019-11-27 09:06 +0200 http://bitbucket.org/pypy/pypy/changeset/c649c1ec74b5/ Log:merge default into release branch diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -99,16 +99,16 @@ Spenser