]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Mon, 9 Feb 2015 20:14:47 +0000 (15:14 -0500)
committerDaniel Lowrey <rdlowrey@php.net>
Mon, 9 Feb 2015 20:14:47 +0000 (15:14 -0500)
commit712712e8d69b48d4c2c7a2e6da6d01bd53286e0b
tree2383fa1fb1c65adef2c8e427bc67844a5b497882
parentf0d9d1828b694ee3df3bd2d4b6f14933f641bd98
parentfb2314798e28b4970cb35497ebc615dffc48d930
Merge branch 'PHP-5.6'

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