From: Jakub Zelenka <bukka@php.net>
Date: Sun, 19 Jun 2016 15:20:02 +0000 (+0100)
Subject: Merge branch 'master' into openssl_error_store
X-Git-Tag: php-7.1.0alpha2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2b90805e81de43b4fa28fa1b30ed255bfba76b2;p=php

Merge branch 'master' into openssl_error_store
---

c2b90805e81de43b4fa28fa1b30ed255bfba76b2