[pypy-commit] pypy py3.5: merge heads

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5
Changeset: r86755:0673c426d243
Date: 2016-08-30 20:48 +0200
http://bitbucket.org/pypy/pypy/changeset/0673c426d243/

Log:	merge heads