]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 22:40:36 +0000 (15:40 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 22:40:36 +0000 (15:40 -0700)
commit8562b8c1631c694cc99102f68056df1ac9af6ded
tree1ee6aa13d223c553c41849f9beb1b1d15ef6c6d5
parenta5551b73db231e05d04f1103e314623035cb94eb
parent734d887b401bae04f3abc285cd3902372871aedf
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #47030 (separate host and peer verification)