Merge branch 'PHP-7.0' into PHP-7.1
authorMatteo Beccati <mbeccati@php.net>
Sun, 27 Nov 2016 09:20:50 +0000 (10:20 +0100)
committerMatteo Beccati <mbeccati@php.net>
Sun, 27 Nov 2016 09:20:50 +0000 (10:20 +0100)
commit461add8adf697a59e390dc4e07ae414939bb8abd
treec0fec2bdcacb42fc6a4198cc924bcd15881d9eb7
parent8101024ad4b41e5b0e322d0a73c8686cb265e912
parent54c04befc2817c4ce85fffee47ccd448e280423a
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix occasionaly failing test