[pypy-commit] pypy py3.6: merge default into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r96034:3c6b4d7e1ce2
Date: 2019-02-16 22:29 +0200
http://bitbucket.org/pypy/pypy/changeset/3c6b4d7e1ce2/

Log:	merge default into branch

diff --git a/pypy/module/_cffi_backend/__init__.py b/pypy/module/_cffi_backend/__init__.py
--- a/pypy/module/_cffi_backend/__init__.py
+++ b/pypy/module/_cffi_backend/__init__.py
@@ -3,7 +3,7 @@
 from rpython.rlib import rdynload, clibffi
 from rpython.rtyper.lltypesystem import rffi
 
-VERSION = "1.12.0"
+VERSION = "1.12.1"
 
 FFI_DEFAULT_ABI = clibffi.FFI_DEFAULT_ABI
 try: