]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'upstream/master'
authorBrad Broerman <bbroerman@bbroerman.net>
Wed, 31 Dec 2014 00:44:45 +0000 (19:44 -0500)
committerBrad Broerman <bbroerman@bbroerman.net>
Wed, 31 Dec 2014 00:44:45 +0000 (19:44 -0500)
commit49571cfad767019533ef184cf98302b2e6b8794d
tree8dfe1aac4eaf7712f78d69a358075ed406b7dc7b
parente4c967a02887f474beb67fc1c6cd46fa46d6316a
parent365f428d463502fd8a2c63640b280753df4bf71f
Merge remote-tracking branch 'upstream/master'

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c