]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.6:
  Bug #47030 (separate host and peer verification)


Trivial merge