]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorBob Weinand <bobwei9@hotmail.com>
Thu, 22 Dec 2016 22:34:51 +0000 (23:34 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 22 Dec 2016 22:34:51 +0000 (23:34 +0100)
1  2 
ext/openssl/xp_ssl.c

Simple merge